diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-31 11:03:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-31 11:03:15 +0300 |
| commit | 12ab59a2d6ff5d327490ca02a34c1f0ad42218b4 (patch) | |
| tree | 868bce6a34e8c63f3f61f77e595a7b4e456ca896 /intern | |
| parent | e4afccf3888d0b4a2d96e3ff1616c8f0628a1754 (diff) | |
| parent | 84a9647f223d46ba6c159f00b3df1cbb41fde9d2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/split/kernel_split_common.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/kernel/split/kernel_split_common.h b/intern/cycles/kernel/split/kernel_split_common.h index b52e7bddc82..abe68104449 100644 --- a/intern/cycles/kernel/split/kernel_split_common.h +++ b/intern/cycles/kernel/split/kernel_split_common.h @@ -59,12 +59,15 @@ ccl_device_inline void kernel_split_path_end(KernelGlobals *kg, int ray_index) ccl_global char *ray_state = kernel_split_state.ray_state; #ifdef __BRANCHED_PATH__ +# ifdef __SUBSURFACE__ ccl_addr_space SubsurfaceIndirectRays *ss_indirect = &kernel_split_state.ss_rays[ray_index]; if(ss_indirect->num_rays) { ASSIGN_RAY_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER); } - else if(IS_FLAG(ray_state, ray_index, RAY_BRANCHED_INDIRECT_SHARED)) { + else +# endif /* __SUBSURFACE__ */ + if(IS_FLAG(ray_state, ray_index, RAY_BRANCHED_INDIRECT_SHARED)) { int orig_ray = kernel_split_state.branched_state[ray_index].original_ray; PathRadiance *L = &kernel_split_state.path_radiance[ray_index]; |