[Bf-blender-cvs] [6ccf340] master: Fix T37790: OSL not rendering subsurface scattering color correct since upgrade to 1.4.

[Brecht Van Lommel]

Commit: 6ccf3402cb87f8635c431f573671fc0cc80a9737
Author: Brecht Van Lommel
Date:   Wed Dec 18 12:29:11 2013 +0100
http://developer.blender.org/rB6ccf3402cb87f8635c431f573671fc0cc80a9737

Fix T37790: OSL not rendering subsurface scattering color correct since upgrade to 1.4.

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

M	intern/cycles/kernel/osl/osl_shader.cpp

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

diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp
index f2be61e..b046101 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/osl_shader.cpp
@@ -150,11 +150,11 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag,
 
 		if (prim) {
 			ShaderClosure sc;
+
 #ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
-			sc.weight = weight*TO_FLOAT3(comp->w);
-#else
-			sc.weight = weight;
+			weight = weight*TO_FLOAT3(comp->w);
 #endif
+			sc.weight = weight;
 
 			prim->setup();
 
@@ -391,11 +391,11 @@ static void flatten_volume_closure_tree(ShaderData *sd,
 
 		if (prim) {
 			ShaderClosure sc;
+
 #ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
-			sc.weight = weight*TO_FLOAT3(comp->w);
-#else
-			sc.weight = weight;
+			weight = weight*TO_FLOAT3(comp->w);
 #endif
+			sc.weight = weight;
 
 			prim->setup();