diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-07-20 05:50:45 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-07-20 05:50:45 +0300 |
| commit | 8c5d90f5ce928e45249ddd9f642c24b6dd69d64c (patch) | |
| tree | ccbbf8f065eadbe85cdc1f8d70a9d036e9c030b5 /intern/cycles/kernel/integrator/intersect_shadow.h | |
| parent | 111bf7d76b080555fd524b2b4a138bcad2e5b206 (diff) | |
| parent | 215f805ce6b540177dedd71721e62c56a764a5ea (diff) | |
Merge branch 'master' into temp-legacy-mesh-format-optiontemp-legacy-mesh-format-option
Diffstat (limited to 'intern/cycles/kernel/integrator/intersect_shadow.h')
| -rw-r--r-- | intern/cycles/kernel/integrator/intersect_shadow.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/kernel/integrator/intersect_shadow.h b/intern/cycles/kernel/integrator/intersect_shadow.h index 3e746998225..1b48b360858 100644 --- a/intern/cycles/kernel/integrator/intersect_shadow.h +++ b/intern/cycles/kernel/integrator/intersect_shadow.h @@ -162,7 +162,7 @@ ccl_device void integrator_intersect_shadow(KernelGlobals kg, IntegratorShadowSt if (opaque_hit) { /* Hit an opaque surface, shadow path ends here. */ - INTEGRATOR_SHADOW_PATH_TERMINATE(DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW); + integrator_shadow_path_terminate(kg, state, DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW); return; } else { @@ -171,7 +171,9 @@ ccl_device void integrator_intersect_shadow(KernelGlobals kg, IntegratorShadowSt * * TODO: could also write to render buffer directly if no transparent shadows? * Could save a kernel execution for the common case. */ - INTEGRATOR_SHADOW_PATH_NEXT(DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW, + integrator_shadow_path_next(kg, + state, + DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW, DEVICE_KERNEL_INTEGRATOR_SHADE_SHADOW); return; } |