[Bf-blender-cvs] [9f2d33a] master: Cycles: Fix wrong transparency flag being set to integrator

[Sergey Sharybin]

Commit: 9f2d33a6524d40c1e01a3fec8dab276094bf9940
Author: Sergey Sharybin
Date:   Thu Jan 7 11:45:13 2016 +0500
Branches: master
https://developer.blender.org/rB9f2d33a6524d40c1e01a3fec8dab276094bf9940

Cycles: Fix wrong transparency flag being set to integrator

Patch from be28706 made it so integrator will use last shader's transparent
shadow flag, which is wrong since last shader might not have transparent
shadow while shaders prior to it might have one.

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

M	intern/cycles/render/shader.cpp

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

diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index d6e854b..6e8004e 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -386,7 +386,7 @@ void ShaderManager::device_update_common(Device *device,
 		shader_flag[i++] = flag;
 		shader_flag[i++] = shader->pass_id;
 
-		has_transparent_shadow = (flag & SD_HAS_TRANSPARENT_SHADOW) != 0;
+		has_transparent_shadow |= (flag & SD_HAS_TRANSPARENT_SHADOW) != 0;
 	}
 
 	device->tex_alloc("__shader_flag", dscene->shader_flag);