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:
authorLukas Tönne <lukas.toenne@gmail.com>2014-02-26 21:44:32 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-02-26 21:47:25 +0400
commitffa94cb7133bf0d77147dcb7abd6da3da2b2dcc9 (patch)
tree7326376a7b667fc8e81b851ed03789cdc49e1a7b /source/blender/render
parente1e247a99b480f81fb76332525002fbc7f776f12 (diff)
Fix for bug reported by Pablo Vasquez (venomgfx) on IRC: Single layer
renders were broken. This was caused by rB1a79abdad2443ff9f12e7efd95ee78a264a9d60a which makes a copy of the render layer list for thread safety. The single layer passed to this function is still in the original list though, so to get the correct index it has to be looked up there. Otherwise no active index is set and all layers are rendered every time.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 50fc9df0d36..4f9e5a21d49 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -588,7 +588,7 @@ void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *
}
if (srl) {
- int index = BLI_findindex(&re->r.layers, srl);
+ int index = BLI_findindex(&rd->layers, srl);
if (index != -1) {
re->r.actlay = index;
re->r.scemode |= R_SINGLE_LAYER;