diff options
| author | Pablo Vazquez <pablo@blender.org> | 2021-10-04 17:21:26 +0300 |
|---|---|---|
| committer | Pablo Vazquez <pablo@blender.org> | 2021-10-04 17:21:26 +0300 |
| commit | f0731bd5ac78856e69f1ee09e4762e7d42dc17c9 (patch) | |
| tree | af1576c25c72517e970fbe07a4a7ad2d1248004f /intern/cycles/kernel/integrator/integrator_intersect_closest.h | |
| parent | 2c5661682b61ac4a8a8f45f77a4eff7b85f6f141 (diff) | |
| parent | 4a3464050c4e83d446d47c946e17b9540f5a3862 (diff) | |
Merge branch 'master' into temp-ui-tweakstemp-ui-tweaks
Diffstat (limited to 'intern/cycles/kernel/integrator/integrator_intersect_closest.h')
| -rw-r--r-- | intern/cycles/kernel/integrator/integrator_intersect_closest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/integrator/integrator_intersect_closest.h b/intern/cycles/kernel/integrator/integrator_intersect_closest.h index 34ca6814534..4e581df1870 100644 --- a/intern/cycles/kernel/integrator/integrator_intersect_closest.h +++ b/intern/cycles/kernel/integrator/integrator_intersect_closest.h @@ -123,7 +123,7 @@ ccl_device_forceinline void integrator_intersect_shader_next_kernel( #ifdef __SHADOW_CATCHER__ const int object_flags = intersection_get_object_flags(kg, isect); if (kernel_shadow_catcher_split(INTEGRATOR_STATE_PASS, object_flags)) { - if (kernel_data.film.use_approximate_shadow_catcher && !kernel_data.background.transparent) { + if (kernel_data.film.pass_background != PASS_UNUSED && !kernel_data.background.transparent) { INTEGRATOR_STATE_WRITE(path, flag) |= PATH_RAY_SHADOW_CATCHER_BACKGROUND; if (use_raytrace_kernel) { |