Merged changes in the trunk up to revision 48893.
[blender-staging.git] / source / blender / render / intern / source / render_result.c
index 3fd59b5e67cbc20081f7974ee0eaf2183c83978a..9eb3f78635f306d0a3823b96d2620605bb4f2b09 100644 (file)
@@ -461,7 +461,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
                rl->lay_zmask = srl->lay_zmask;
                rl->lay_exclude = srl->lay_exclude;
                rl->layflag = srl->layflag;
-               rl->passflag = srl->passflag; // for debugging: srl->passflag|SCE_PASS_RAYHITS;
+               rl->passflag = srl->passflag; /* for debugging: srl->passflag | SCE_PASS_RAYHITS; */
                rl->pass_xor = srl->pass_xor;
                rl->light_override = srl->light_override;
                rl->mat_override = srl->mat_override;
@@ -585,7 +585,7 @@ RenderResult *render_result_new_full_sample(Render *re, ListBase *lb, rcti *part
 }
 
 /* callbacks for render_result_new_from_exr */
-static void *ml_addlayer_cb(void *base, char *str)
+static void *ml_addlayer_cb(void *base, const char *str)
 {
        RenderResult *rr = base;
        RenderLayer *rl;
@@ -597,7 +597,7 @@ static void *ml_addlayer_cb(void *base, char *str)
        return rl;
 }
 
-static void ml_addpass_cb(void *UNUSED(base), void *lay, char *str, float *rect, int totchan, char *chan_id)
+static void ml_addpass_cb(void *UNUSED(base), void *lay, const char *str, float *rect, int totchan, const char *chan_id)
 {
        RenderLayer *rl = lay;
        RenderPass *rpass = MEM_callocN(sizeof(RenderPass), "loaded pass");
@@ -621,7 +621,7 @@ static void ml_addpass_cb(void *UNUSED(base), void *lay, char *str, float *rect,
 /* from imbuf, if a handle was returned we convert this to render result */
 RenderResult *render_result_new_from_exr(void *exrhandle, int rectx, int recty)
 {
-       RenderResult *rr = MEM_callocN(sizeof(RenderResult), "loaded render result");
+       RenderResult *rr = MEM_callocN(sizeof(RenderResult), __func__);
        RenderLayer *rl;
        RenderPass *rpass;