[Bf-blender-cvs] [fbddf872886] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: fbddf872886fbb8e0abf0fe08ca761b20c416461
Author: Sergey Sharybin
Date:   Fri Jul 30 11:26:27 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBfbddf872886fbb8e0abf0fe08ca761b20c416461

Merge branch 'master' into cycles-x

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



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

diff --cc intern/cycles/blender/addon/engine.py
index 98c032da4e9,489a883f098..77fbcd1697e
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@@ -205,16 -259,16 +208,17 @@@ def list_render_passes(scene, srl)
      if srl.use_pass_transmission_direct:   yield ("TransDir",      "RGB",  'COLOR')
      if srl.use_pass_transmission_indirect: yield ("TransInd",      "RGB",  'COLOR')
      if srl.use_pass_transmission_color:    yield ("TransCol",      "RGB",  'COLOR')
+     if crl.use_pass_volume_direct:         yield ("VolumeDir",     "RGB",  'COLOR')
+     if crl.use_pass_volume_indirect:       yield ("VolumeInd",     "RGB",  'COLOR')
      if srl.use_pass_emit:                  yield ("Emit",          "RGB",  'COLOR')
      if srl.use_pass_environment:           yield ("Env",           "RGB",  'COLOR')
+     if srl.use_pass_shadow:                yield ("Shadow",        "RGB",  'COLOR')
+     if srl.use_pass_ambient_occlusion:     yield ("AO",            "RGB",  'COLOR')
++    if crl.use_pass_shadow_catcher:        yield ("Shadow Catcher",      "RGB",  'COLOR')
  
-     # Cycles specific passes.
-     crl = srl.cycles
-     if crl.pass_debug_render_time:             yield ("Debug Render Time",   "X",    'VALUE')
-     if crl.pass_debug_sample_count:            yield ("Debug Sample Count",  "X",    'VALUE')
-     if crl.use_pass_volume_direct:             yield ("VolumeDir",           "RGB",  'COLOR')
-     if crl.use_pass_volume_indirect:           yield ("VolumeInd",           "RGB",  'COLOR')
-     if crl.use_pass_shadow_catcher:            yield ("Shadow Catcher",      "RGB",  'COLOR')
+     # Debug passes.
+     if crl.pass_debug_render_time:             yield ("Debug Render Time",             "X",   'VALUE')
+     if crl.pass_debug_sample_count:            yield ("Debug Sample Count",            "X",   'VALUE')
  
      # Cryptomatte passes.
      crypto_depth = (srl.pass_cryptomatte_depth + 1) // 2