Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/render/intern/source/render_result.c14
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 */