[Bf-blender-cvs] [a966ed15504] cycles-x: Fix incorrect denoised shadow catcher pass after last fix

[Brecht Van Lommel]

Commit: a966ed1550464611e2e0539b550b554577a02b54
Author: Brecht Van Lommel
Date:   Thu Jul 22 20:24:07 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBa966ed1550464611e2e0539b550b554577a02b54

Fix incorrect denoised shadow catcher pass after last fix

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

M	intern/cycles/integrator/pass_accessor.cpp
M	intern/cycles/render/pass.cpp

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

diff --git a/intern/cycles/integrator/pass_accessor.cpp b/intern/cycles/integrator/pass_accessor.cpp
index 6ff8585007c..ab715ad5ad9 100644
--- a/intern/cycles/integrator/pass_accessor.cpp
+++ b/intern/cycles/integrator/pass_accessor.cpp
@@ -221,7 +221,8 @@ bool PassAccessor::get_render_tile_pixels(const RenderBuffers *render_buffers,
     }
     else if (mode == PassMode::DENOISED) {
       /* Denoised passes store their final pixels, no need in special calculation. */
-      if (type == PASS_COMBINED) {
+      if (type == PASS_COMBINED || type == PASS_SHADOW_CATCHER ||
+          type == PASS_SHADOW_CATCHER_MATTE) {
         get_pass_combined(render_buffers, buffer_params, destination);
       }
       else {
@@ -237,7 +238,7 @@ bool PassAccessor::get_render_tile_pixels(const RenderBuffers *render_buffers,
     else if (type == PASS_SHADOW_CATCHER) {
       get_pass_shadow_catcher(render_buffers, buffer_params, destination);
     }
-    else if (type == PASS_COMBINED) {
+    else if (type == PASS_COMBINED || type == PASS_SHADOW_CATCHER_MATTE) {
       get_pass_combined(render_buffers, buffer_params, destination);
     }
     else {
diff --git a/intern/cycles/render/pass.cpp b/intern/cycles/render/pass.cpp
index 1feb73a3624..7aa035398d8 100644
--- a/intern/cycles/render/pass.cpp
+++ b/intern/cycles/render/pass.cpp
@@ -213,7 +213,7 @@ PassInfo Pass::get_info(PassType type)
       pass_info.use_exposure = true;
       break;
     case PASS_AO:
-      pass_info.num_components = 4;
+      pass_info.num_components = 3;
       break;
     case PASS_SHADOW:
       pass_info.num_components = 3;