diff options
author | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-04-30 10:29:03 +0400 |
---|---|---|
committer | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-05-03 13:29:58 +0400 |
commit | 6ec2d72eca618be05e9bf0723886b10e6d5efa46 (patch) | |
tree | 5ffd2e356ebea877eb9a19254c085fb245de9167 /source/blender/render | |
parent | c7612d68b2bcf71d39f683059811f61c15a6d4b1 (diff) |
Alternative fix for T39941, this also fixes odd behavior of rendered preview.
The rendered preview didn't show active layer or wasn't updated if the
layer was disabled. Now the viewport always shows an active layer regardless
of whether it's enabled or disabled.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 3a91d092088..40de1080634 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -481,10 +481,14 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf if (strcmp(srl->name, layername) != 0) continue; - if ((re->r.scemode & R_SINGLE_LAYER) && nr != re->r.actlay) - continue; - if (srl->layflag & SCE_LAY_DISABLE) - continue; + if (re->r.scemode & R_SINGLE_LAYER) { + if (nr != re->r.actlay) + continue; + } + else { + if (srl->layflag & SCE_LAY_DISABLE) + continue; + } rl = MEM_callocN(sizeof(RenderLayer), "new render layer"); BLI_addtail(&rr->layers, rl); @@ -604,8 +608,6 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf rl->passflag = SCE_PASS_COMBINED; re->r.actlay = 0; - srl = BLI_findlink(&re->r.layers, re->r.actlay); - BLI_strncpy(rl->name, srl->name, sizeof(rl->name)); } /* border render; calculate offset for use in compositor. compo is centralized coords */ |