RPRBLND-1984: Add New Cryptomatte workflow support. (#443)

PURPOSE

In Blender 2.93 was changed Cryptomatte AOV workflow, and need to add support for this in Compositor.

EFFECT OF CHANGE

Renamed cryptomatte AOVs to the same as in Cycles, which made it work in new Cryptomatte node. Improved UI in AOVs panel related to cryptomatte.

Author: bnagirniak

src/rprblender/engine/render_engine.py

@@ -128,7 +128,7 @@ def set_render_result(render_passes: bpy.types.RenderPasses):
 
                 else:
                     aovs_info = RPR_ViewLayerProperites.cryptomatte_aovs_info \
-                        if "Cryptomatte" in p.name else RPR_ViewLayerProperites.aovs_info
+                        if "Crypto" in p.name else RPR_ViewLayerProperites.aovs_info
                     aov = next((aov for aov in aovs_info
                                 if aov['name'] == p.name), None)
                     if aov and self.rpr_context.is_aov_enabled(aov['rpr']):

src/rprblender/properties/view_layer.py

@@ -410,32 +410,32 @@ class RPR_ViewLayerProperites(RPR_Properties):
     cryptomatte_aovs_info = (
         {
             'rpr': pyrpr.AOV_CRYPTOMATTE_MAT0,
-            'name': "Cryptomatte Mat0",
+            'name': "CryptoMaterial00",
             'channel': 'RGBA'
         },
         {
             'rpr': pyrpr.AOV_CRYPTOMATTE_MAT1,
-            'name': "Cryptomatte Mat1",
+            'name': "CryptoMaterial01",
             'channel': 'RGBA'
         },
         {
             'rpr': pyrpr.AOV_CRYPTOMATTE_MAT2,
-            'name': "Cryptomatte Mat2",
+            'name': "CryptoMaterial02",
             'channel': 'RGBA'
         },
         {
             'rpr': pyrpr.AOV_CRYPTOMATTE_OBJ0,
-            'name': "Cryptomatte Obj0",
+            'name': "CryptoObject00",
             'channel': 'RGBA'
         },
         {
             'rpr': pyrpr.AOV_CRYPTOMATTE_OBJ1,
-            'name': "Cryptomatte Obj1",
+            'name': "CryptoObject01",
             'channel': 'RGBA'
         },
         {
             'rpr': pyrpr.AOV_CRYPTOMATTE_OBJ2,
-            'name': "Cryptomatte Obj2",
+            'name': "CryptoObject02",
             'channel': 'RGBA'
         },
     )
@@ -460,14 +460,14 @@ def aov_enabled_changed(self, context):
     )
 
     crytomatte_aov_object: BoolProperty(
-        name="Cryptomatte Object AOVs",
+        name="Cryptomatte Object",
         description="Enable Object Cryptomatte AOVs",
         default=False,
         update=aov_enabled_changed,
     )
 
     crytomatte_aov_material: BoolProperty(
-        name="Cryptomatte Material AOVs",
+        name="Cryptomatte Material",
         description="Enable Material Cryptomatte AOVs",
         default=False,
         update=aov_enabled_changed,

src/rprblender/ui/view_layer.py

@@ -31,11 +31,11 @@ def draw(self, context):
                 # not displaying "Combined" pass as it is always enabled by Blender
                 continue
 
-            col = col1 if i <= len(view_layer.enable_aovs) // 2 else col2
+            col = col1 if i <= (len(view_layer.enable_aovs) // 2) + 1 else col2
             r = col.row()
             r.prop(view_layer, 'enable_aovs', index=i, text=aov['name'])
 
-        col1.prop(view_layer, 'crytomatte_aov_object')
+        col2.prop(view_layer, 'crytomatte_aov_object')
         col2.prop(view_layer, 'crytomatte_aov_material')