diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-11-16 11:32:02 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-11-16 12:59:31 +0300 |
| commit | 470b4cb62f543263f0087a1e9d39b4b125752d23 (patch) | |
| tree | 5cc29c331a7f3e3f3de1308e1180c778c381ea96 /intern/cycles/kernel/split/kernel_subsurface_scatter.h | |
| parent | 9c7b89241df26fbc224b826318fcb0401e024c46 (diff) | |
Cycles: Fix crash with split branched path tracing
ShaderData memory was getting clobbered in the branched path code paths.
Was caused by 087331c495b04ebd37903c0dc0e46262354cf026
Diffstat (limited to 'intern/cycles/kernel/split/kernel_subsurface_scatter.h')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_subsurface_scatter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/split/kernel_subsurface_scatter.h b/intern/cycles/kernel/split/kernel_subsurface_scatter.h index 887c3e313d1..5bf7483e9a2 100644 --- a/intern/cycles/kernel/split/kernel_subsurface_scatter.h +++ b/intern/cycles/kernel/split/kernel_subsurface_scatter.h @@ -37,7 +37,7 @@ ccl_device_noinline bool kernel_split_branched_path_subsurface_indirect_light_it { SplitBranchedState *branched_state = &kernel_split_state.branched_state[ray_index]; - ShaderData *sd = &branched_state->sd; + ShaderData *sd = kernel_split_sd(branched_state_sd, ray_index); PathRadiance *L = &kernel_split_state.path_radiance[ray_index]; ShaderData *emission_sd = AS_SHADER_DATA(&kernel_split_state.sd_DL_shadow[ray_index]); |