[Bf-blender-cvs] [8aa0abc2398] cycles-x: Cycles X: Allow viewing shadow catcher pass in viewport

[Sergey Sharybin]

Commit: 8aa0abc239894f44b4456faff244b3007c681d71
Author: Sergey Sharybin
Date:   Thu Jun 3 11:59:32 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB8aa0abc239894f44b4456faff244b3007c681d71

Cycles X: Allow viewing shadow catcher pass in viewport

Differential Revision: https://developer.blender.org/D11482

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

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/render/scene.cpp

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

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 3efb4bea106..797f9da5123 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -132,6 +132,7 @@ enum_view3d_shading_render_pass = (
     ('EMISSION', "Emission", "Show the Emission render pass", 2),
     ('BACKGROUND', "Background", "Show the Background render pass", 3),
     ('AO', "Ambient Occlusion", "Show the Ambient Occlusion render pass", 4),
+    ('SHADOW_CATCHER', "Shadow Catcher", "Show the Shadow Catcher render pass", 52),
 
     ('', "Light", ""),
 
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 3f1a432a60e..9323312e317 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -579,7 +579,7 @@ void Scene::update_passes()
   }
 
   /* Create passes for shadow catcher. */
-  if (has_shadow_catcher()) {
+  if (display_pass == PASS_SHADOW_CATCHER || has_shadow_catcher()) {
     Pass::add(PASS_SHADOW_CATCHER, passes, nullptr, true);
     Pass::add(PASS_SHADOW_CATCHER_MATTE, passes, nullptr, true);
   }