[Bf-blender-cvs] [ffa94cb] master: Fix for bug reported by Pablo Vasquez (venomgfx) on IRC: Single layer renders were broken.

Lukas Tönne noreply at git.blender.org
Wed Feb 26 18:52:43 CET 2014


Commit: ffa94cb7133bf0d77147dcb7abd6da3da2b2dcc9
Author: Lukas Tönne
Date:   Wed Feb 26 18:44:32 2014 +0100
https://developer.blender.org/rBffa94cb7133bf0d77147dcb7abd6da3da2b2dcc9

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.

===================================================================

M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 50fc9df..4f9e5a2 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;




More information about the Bf-blender-cvs mailing list