[Bf-blender-cvs] [83d412a504b] blender-v3.2-release: Fix T98367: Light group passes do not work when shadow catcher is used

[Lukas Stockner]

Commit: 83d412a504bf5e1399f61b34154ef8927049ac65
Author: Lukas Stockner
Date:   Sun Jul 24 20:32:19 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB83d412a504bf5e1399f61b34154ef8927049ac65

Fix T98367: Light group passes do not work when shadow catcher is used

===================================================================

M	intern/cycles/session/buffers.cpp

===================================================================

diff --git a/intern/cycles/session/buffers.cpp b/intern/cycles/session/buffers.cpp
index b74074765fe..e060e0c6829 100644
--- a/intern/cycles/session/buffers.cpp
+++ b/intern/cycles/session/buffers.cpp
@@ -209,7 +209,7 @@ const BufferPass *BufferParams::get_actual_display_pass(const BufferPass *pass)
     return nullptr;
   }
 
-  if (pass->type == PASS_COMBINED) {
+  if (pass->type == PASS_COMBINED && pass->lightgroup.empty()) {
     const BufferPass *shadow_catcher_matte_pass = find_pass(PASS_SHADOW_CATCHER_MATTE, pass->mode);
     if (shadow_catcher_matte_pass) {
       pass = shadow_catcher_matte_pass;