Commit: d290b8b2b9ecaa5c9b477aa1868b69db15a84cd3
Author: Lukas Stockner
Date: Fri Jan 6 02:32:03 2023 +0100
Branches: blender-v3.3-release
https://developer.blender.org/rBd290b8b2b9ecaa5c9b477aa1868b69db15a84cd3
Fix T103403: Lightgroup passes can contain lighting on shadow catchers
===================================================================
M intern/cycles/kernel/film/accumulate.h
===================================================================
diff --git a/intern/cycles/kernel/film/accumulate.h
b/intern/cycles/kernel/film/accumulate.h
index 33c35a68ad0..52116eb2dd8 100644
--- a/intern/cycles/kernel/film/accumulate.h
+++ b/intern/cycles/kernel/film/accumulate.h
@@ -348,7 +348,9 @@ ccl_device_inline void
kernel_accum_emission_or_background_pass(
}
# endif /* __DENOISING_FEATURES__ */
- if (lightgroup != LIGHTGROUP_NONE && kernel_data.film.pass_lightgroup !=
PASS_UNUSED) {
+ const bool is_shadowcatcher = (path_flag & PATH_RAY_SHADOW_CATCHER_HIT) != 0;
+ if (!is_shadowcatcher && lightgroup != LIGHTGROUP_NONE &&
+ kernel_data.film.pass_lightgroup != PASS_UNUSED) {
kernel_write_pass_float3(buffer + kernel_data.film.pass_lightgroup + 3 *
lightgroup,
contribution);
}
@@ -357,13 +359,12 @@ ccl_device_inline void
kernel_accum_emission_or_background_pass(
/* Directly visible, write to emission or background pass. */
pass_offset = pass;
}
- else if (kernel_data.kernel_features & KERNEL_FEATURE_LIGHT_PASSES) {
+ else if (is_shadowcatcher) {
/* Don't write any light passes for shadow catcher, for easier
* compositing back together of the combined pass. */
- if (path_flag & PATH_RAY_SHADOW_CATCHER_HIT) {
- return;
- }
-
+ return;
+ }
+ else if (kernel_data.kernel_features & KERNEL_FEATURE_LIGHT_PASSES) {
if (path_flag & PATH_RAY_SURFACE_PASS) {
/* Indirectly visible through reflection. */
const float3 diffuse_weight = INTEGRATOR_STATE(state, path,
pass_diffuse_weight);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
