Fix T54105: random walk SSS missing in branched indirect paths.

[blender-staging.git] / intern / cycles / kernel / split / kernel_indirect_subsurface.h

diff --git a/intern/cycles/kernel/split/kernel_indirect_subsurface.h b/intern/cycles/kernel/split/kernel_indirect_subsurface.h
index e9fe5552e8cde90fdbd09178c4d5983dda2e8803..b65f3d1a9402aa5fe83f82c3736c583e5cafc485 100644 (file)
--- a/intern/cycles/kernel/split/kernel_indirect_subsurface.h
+++ b/intern/cycles/kernel/split/kernel_indirect_subsurface.h
@@ -49,28 +49,22 @@ ccl_device void kernel_indirect_subsurface(KernelGlobals *kg)
        ccl_global Ray *ray = &kernel_split_state.ray[ray_index];
        ccl_global float3 *throughput = &kernel_split_state.throughput[ray_index];
 
-#ifdef __BRANCHED_PATH__
-       if(!kernel_data.integrator.branched) {
-#endif
-               if(IS_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER)) {
-                       ccl_addr_space SubsurfaceIndirectRays *ss_indirect = &kernel_split_state.ss_rays[ray_index];
+       if(IS_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER)) {
+               ccl_addr_space SubsurfaceIndirectRays *ss_indirect = &kernel_split_state.ss_rays[ray_index];
 
-                       /* Trace indirect subsurface rays by restarting the loop. this uses less
-                        * stack memory than invoking kernel_path_indirect.
-                        */
-                       if(ss_indirect->num_rays) {
-                               kernel_path_subsurface_setup_indirect(kg,
-                                                                         ss_indirect,
-                                                                         state,
-                                                                         ray,
-                                                                         L,
-                                                                         throughput);
-                               ASSIGN_RAY_STATE(ray_state, ray_index, RAY_REGENERATED);
-                       }
+               /* Trace indirect subsurface rays by restarting the loop. this uses less
+                * stack memory than invoking kernel_path_indirect.
+                */
+               if(ss_indirect->num_rays) {
+                       kernel_path_subsurface_setup_indirect(kg,
+                                                                                                 ss_indirect,
+                                                                                                 state,
+                                                                                                 ray,
+                                                                                                 L,
+                                                                                                 throughput);
+                       ASSIGN_RAY_STATE(ray_state, ray_index, RAY_REGENERATED);
                }
-#ifdef __BRANCHED_PATH__
        }
-#endif
 
 #endif  /* __SUBSURFACE__ */