From 6ccf3402cb87f8635c431f573671fc0cc80a9737 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 18 Dec 2013 12:29:11 +0100 Subject: [PATCH] Fix T37790: OSL not rendering subsurface scattering color correct since upgrade to 1.4. --- intern/cycles/kernel/osl/osl_shader.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index f2be61eb535..b0461013239 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();