From 6ec2d72eca618be05e9bf0723886b10e6d5efa46 Mon Sep 17 00:00:00 2001 From: IRIE Shinsuke Date: Wed, 30 Apr 2014 15:29:03 +0900 Subject: 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. --- source/blender/render/intern/source/render_result.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source/blender/render') 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 */ -- cgit v1.2.3