[Bf-blender-cvs] [ed667e344d7] master: Merge branch 'blender-v2.92-release'

[Jeroen Bakker]

Commit: ed667e344d7e9f72f2b1a0302e241606276a06ae
Author: Jeroen Bakker
Date:   Fri Feb 12 11:55:42 2021 +0100
Branches: master
https://developer.blender.org/rBed667e344d7e9f72f2b1a0302e241606276a06ae

Merge branch 'blender-v2.92-release'

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



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

diff --cc intern/cycles/blender/addon/version_update.py
index 5dae88d60c7,2c5df9a9af3..cdff3c2b915
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@@ -108,7 -108,7 +108,7 @@@ def do_versions(self)
          library_versions.setdefault(library.version, []).append(library)
  
      # Do versioning per library, since they might have different versions.
-     max_need_versioning = (2, 92, 4)
 -    max_need_versioning = (2, 92, 14)
++    max_need_versioning = (2, 93, 7)
      for version, libraries in library_versions.items():
          if version > max_need_versioning:
              continue
@@@ -204,6 -204,18 +204,18 @@@
                      view_layer.pass_cryptomatte_depth = cview_layer.get("pass_crypto_depth", 6)
                      view_layer.use_pass_cryptomatte_accurate = cview_layer.get("pass_crypto_accurate", True)
  
 -            if version <= (2, 92, 14):
++            if version <= (2, 93, 7):
+                 if scene.render.engine == 'CYCLES':
+                   for view_layer in scene.view_layers:
+                     cview_layer = view_layer.cycles
+                     for caov in cview_layer.get("aovs", []):
+                         aov_name = caov.get("name", "AOV")
+                         if aov_name in view_layer.aovs:
+                             continue
+                         baov = view_layer.aovs.add()
+                         baov.name = caov.get("name", "AOV")
+                         baov.type = "COLOR" if caov.get("type", 1) == 1 else "VALUE"
+ 
          # Lamps
          for light in bpy.data.lights:
              if light.library not in libraries:
diff --cc release/scripts/startup/bl_ui/properties_view_layer.py
index b3367063cc0,6780e066791..8c39684583f
--- a/release/scripts/startup/bl_ui/properties_view_layer.py
+++ b/release/scripts/startup/bl_ui/properties_view_layer.py
@@@ -119,7 -119,7 +119,8 @@@ class VIEWLAYER_PT_eevee_layer_passes_l
          col.prop(view_layer, "use_pass_emit", text="Emission")
          col.prop(view_layer, "use_pass_environment")
          col.prop(view_layer, "use_pass_shadow")
--        col.prop(view_layer, "use_pass_ambient_occlusion", text="Ambient Occlusion")
++        col.prop(view_layer, "use_pass_ambient_occlusion",
++                 text="Ambient Occlusion")
  
  
  class VIEWLAYER_PT_eevee_layer_passes_effects(ViewLayerButtonsPanel, Panel):
@@@ -158,7 -156,7 +157,8 @@@ class ViewLayerAOVPanel(ViewLayerButton
  
          row = layout.row()
          col = row.column()
--        col.template_list("VIEWLAYER_UL_aov", "aovs", view_layer, "aovs", view_layer, "active_aov_index", rows=2)
++        col.template_list("VIEWLAYER_UL_aov", "aovs", view_layer,
++                          "aovs", view_layer, "active_aov_index", rows=2)
  
          col = row.column()
          sub = col.column(align=True)
@@@ -167,10 -165,15 +167,16 @@@
  
          aov = view_layer.active_aov
          if aov and not aov.is_valid:
--            layout.label(text="Conflicts with another render pass with the same name", icon='ERROR')
++            layout.label(
++                text="Conflicts with another render pass with the same name", icon='ERROR')
+ 
+ 
+ class VIEWLAYER_PT_layer_passes_aov(ViewLayerAOVPanel):
+     bl_parent_id = "VIEWLAYER_PT_layer_passes"
+     COMPAT_ENGINES = {'BLENDER_EEVEE'}
  
  
- class ViewLayerCryptomattePanel(ViewLayerButtonsPanel):
+ class ViewLayerCryptomattePanel(ViewLayerButtonsPanel, Panel):
      bl_label = "Cryptomatte"
  
      def draw(self, context):
@@@ -190,10 -193,10 +196,11 @@@
                            view_layer.use_pass_cryptomatte_material,
                            view_layer.use_pass_cryptomatte_asset))
          col.prop(view_layer, "pass_cryptomatte_depth", text="Levels")
--        col.prop(view_layer, "use_pass_cryptomatte_accurate", text="Accurate Mode")
++        col.prop(view_layer, "use_pass_cryptomatte_accurate",
++                 text="Accurate Mode")
  
  
 -class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerCryptomattePanel):
 +class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerCryptomattePanel, Panel):
      bl_parent_id = "VIEWLAYER_PT_layer_passes"
      COMPAT_ENGINES = {'BLENDER_EEVEE'}