diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-25 00:30:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-25 00:33:49 +0300 |
| commit | 87cff57207ca05602794e5dd1d7f08cd7818fbb6 (patch) | |
| tree | f4542ede2f23936609ae25119f238e2b7e5764aa /intern/cycles/kernel/osl | |
| parent | 41ed59e0ebe23d99f3cc394d03ff629417e6115a (diff) | |
Fix T44123: Cycles SSS renders black in recent builds
Issue was introduced in 01ee21f where i didn't notice *_setup()
function only doing partial initialization, and some of parameters
are expected to be initialized by callee function.
This was hitting only some setups, so tests with benchmark scenes
didn't unleash issues. Now it should all be fine.
This is to go to the 2.74 branch and we actually might re-AHOY.
Diffstat (limited to 'intern/cycles/kernel/osl')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index ebf72ae11f4..fa6745a17a1 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -267,6 +267,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, if(fabsf(weight.x) > 0.0f) { sc.weight = make_float3(weight.x, 0.0f, 0.0f); sc.data0 = bssrdf->radius.x; + sc.data1 = 0.0f; sd->flag |= bssrdf_setup(&sc, sc.type); sd->closure[sd->num_closure++] = sc; } @@ -274,6 +275,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, if(fabsf(weight.y) > 0.0f) { sc.weight = make_float3(0.0f, weight.y, 0.0f); sc.data0 = bssrdf->radius.y; + sc.data1 = 0.0f; sd->flag |= bssrdf_setup(&sc, sc.type); sd->closure[sd->num_closure++] = sc; } @@ -281,6 +283,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, if(fabsf(weight.z) > 0.0f) { sc.weight = make_float3(0.0f, 0.0f, weight.z); sc.data0 = bssrdf->radius.z; + sc.data1 = 0.0f; sd->flag |= bssrdf_setup(&sc, sc.type); sd->closure[sd->num_closure++] = sc; } |