From fc1a98b47173d34843b0e2b59ca6e492763700d0 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Wed, 23 Aug 2023 09:32:32 +0100
Subject: [PATCH] Added support for custom render passes

---
 .../blender/plugins/publish/collect_render.py | 15 ++++++++++-
 .../defaults/project_settings/blender.json    |  3 ++-
 .../schema_project_blender.json               | 27 +++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/blender/plugins/publish/collect_render.py b/openpype/hosts/blender/plugins/publish/collect_render.py
index 309d40d9fd..7c95bb14cf 100644
--- a/openpype/hosts/blender/plugins/publish/collect_render.py
+++ b/openpype/hosts/blender/plugins/publish/collect_render.py
@@ -168,7 +168,10 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
                             ["RenderSettings"]
                             ["aov_list"])
 
-        scene = bpy.context.scene
+        custom_passes = (settings["blender"]
+                                 ["RenderSettings"]
+                                 ["custom_passes"])
+
         vl = bpy.context.view_layer
 
         vl.use_pass_combined = "combined" in aov_list
@@ -185,6 +188,16 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
         vl.use_pass_shadow = "shadow" in aov_list
         vl.use_pass_ambient_occlusion = "ao" in aov_list
 
+        aovs_names = [aov.name for aov in vl.aovs]
+        for cp in custom_passes:
+            cp_name = cp[0]
+            if cp_name not in aovs_names:
+                aov = vl.aovs.add()
+                aov.name = cp_name
+            else:
+                aov = vl.aovs[cp_name]
+            aov.type = cp[1].get("type", "VALUE")
+
     def _create_context(self):
         context = bpy.context.copy()
 
diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json
index d36fc503dd..8b1d602df0 100644
--- a/openpype/settings/defaults/project_settings/blender.json
+++ b/openpype/settings/defaults/project_settings/blender.json
@@ -22,7 +22,8 @@
         "aov_separator": "underscore",
         "image_format": "exr",
         "multilayer_exr": true,
-        "aov_list": []
+        "aov_list": [],
+        "custom_passes": []
     },
     "workfile_builder": {
         "create_first_version": false,
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
index b7d61d1d69..8db57f49eb 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
@@ -121,6 +121,33 @@
                         {"shadow": "Shadow"},
                         {"ao": "Ambient Occlusion"}
                     ]
+                },
+                {
+                    "type": "label",
+                    "label": "Add custom AOVs. They are added to the view layer and in the Compositing Nodetree,\nbut they need to be added manually to the Shader Nodetree."
+                },
+                {
+                    "type": "dict-modifiable",
+                    "store_as_list": true,
+                    "key": "custom_passes",
+                    "label": "Custom Passes",
+                    "use_label_wrap": true,
+                    "object_type": {
+                        "type": "dict",
+                        "children": [
+                            {
+                                "key": "type",
+                                "label": "Type",
+                                "type": "enum",
+                                "multiselection": false,
+                                "defaults": "color",
+                                "enum_items": [
+                                    {"COLOR": "Color"},
+                                    {"VALUE": "Value"}
+                                ]
+                            }
+                        ]
+                    }
                 }
             ]
         },