diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-11-22 23:06:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-22 23:06:10 +0300 |
| commit | 48c2b4012f788b25b3e1ac90f8626560a24987e6 (patch) | |
| tree | f411139895f6861e0b84e891639233d928cbe508 /intern/cycles/kernel/film | |
| parent | 29681f186e1a6865da0b4936805df5a608b90ee9 (diff) | |
| parent | e2b736aa406e3e87a839d2f96ac9a1718ec253e3 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/kernel/film')
| -rw-r--r-- | intern/cycles/kernel/film/accumulate.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/film/passes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/film/accumulate.h b/intern/cycles/kernel/film/accumulate.h index 9ee0d27cc8c..fb52b1cd05f 100644 --- a/intern/cycles/kernel/film/accumulate.h +++ b/intern/cycles/kernel/film/accumulate.h @@ -502,7 +502,7 @@ ccl_device_inline void kernel_accum_light(KernelGlobals kg, /* Write shadow pass. */ if (kernel_data.film.pass_shadow != PASS_UNUSED && (path_flag & PATH_RAY_SHADOW_FOR_LIGHT) && - (path_flag & PATH_RAY_CAMERA)) { + (path_flag & PATH_RAY_TRANSPARENT_BACKGROUND)) { const float3 unshadowed_throughput = INTEGRATOR_STATE( state, shadow_path, unshadowed_throughput); const float3 shadowed_throughput = INTEGRATOR_STATE(state, shadow_path, throughput); diff --git a/intern/cycles/kernel/film/passes.h b/intern/cycles/kernel/film/passes.h index 77761709a78..269e3620388 100644 --- a/intern/cycles/kernel/film/passes.h +++ b/intern/cycles/kernel/film/passes.h @@ -177,7 +177,7 @@ ccl_device_inline void kernel_write_data_passes(KernelGlobals kg, #ifdef __PASSES__ const uint32_t path_flag = INTEGRATOR_STATE(state, path, flag); - if (!(path_flag & PATH_RAY_CAMERA)) { + if (!(path_flag & PATH_RAY_TRANSPARENT_BACKGROUND)) { return; } |