From 0fc23ce2e7600c335bd05ccc642f742497a36282 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 21 Dec 2023 15:06:31 +0000
Subject: [PATCH 01/14] Changed logic for creation of output node

---
 openpype/hosts/blender/api/render_lib.py | 70 ++++++++++++++++--------
 1 file changed, 48 insertions(+), 22 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index b437078ad8b..cdccf138055 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -135,71 +135,95 @@ def set_render_passes(settings):
     return aov_list, custom_passes
 
 
-def set_node_tree(output_path, name, aov_sep, ext, multilayer):
+def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
     # Set the scene to use the compositor node tree to render
     bpy.context.scene.use_nodes = True
 
     tree = bpy.context.scene.node_tree
 
+    comp_layer_type = "CompositorNodeRLayers"
+    output_type = "CompositorNodeOutputFile"
+
     # Get the Render Layers node
     rl_node = None
     for node in tree.nodes:
-        if node.bl_idname == "CompositorNodeRLayers":
+        if node.bl_idname == comp_layer_type:
             rl_node = node
             break
 
     # If there's not a Render Layers node, we create it
     if not rl_node:
-        rl_node = tree.nodes.new("CompositorNodeRLayers")
+        rl_node = tree.nodes.new(comp_layer_type)
 
     # Get the enabled output sockets, that are the active passes for the
     # render.
     # We also exclude some layers.
-    exclude_sockets = ["Image", "Alpha", "Noisy Image"]
+    exclude_sockets = ["Alpha", "Noisy Image"]
     passes = [
         socket
         for socket in rl_node.outputs
         if socket.enabled and socket.name not in exclude_sockets
     ]
 
-    # Remove all output nodes
+    old_output = None
+
+    # Remove all output nodes that inlcude "AYON" in the name.
+    # There should be only one.
     for node in tree.nodes:
-        if node.bl_idname == "CompositorNodeOutputFile":
-            tree.nodes.remove(node)
+        if node.bl_idname == output_type and "AYON" in node.name:
+            old_output = node
+            break
 
     # Create a new output node
-    output = tree.nodes.new("CompositorNodeOutputFile")
+    output = tree.nodes.new(output_type)
 
     image_settings = bpy.context.scene.render.image_settings
     output.format.file_format = image_settings.file_format
 
+    slots = None
+
     # In case of a multilayer exr, we don't need to use the output node,
     # because the blender render already outputs a multilayer exr.
-    if ext == "exr" and multilayer:
-        output.layer_slots.clear()
-        return []
+    multi_exr = ext == "exr" and multilayer
+    slots = output.layer_slots if multi_exr else output.file_slots
+    output.base_path = render_product if multi_exr else str(output_path)
 
-    output.file_slots.clear()
-    output.base_path = str(output_path)
+    slots.clear()
 
     aov_file_products = []
 
     # For each active render pass, we add a new socket to the output node
     # and link it
-    for render_pass in passes:
-        filepath = f"{name}{aov_sep}{render_pass.name}.####"
+    for rpass in passes:
+        if rpass.name == "Image":
+            pass_name = "rgba" if multi_exr else "beauty"
+        else:
+            pass_name = rpass.name
+        filepath = f"{name}{aov_sep}{pass_name}.####"
 
-        output.file_slots.new(filepath)
+        slots.new(pass_name if multi_exr else filepath)
 
         filename = str(output_path / filepath.lstrip("/"))
 
-        aov_file_products.append((render_pass.name, filename))
+        aov_file_products.append((rpass.name, filename))
+
+        if not old_output:
+            node_input = output.inputs[-1]
+            tree.links.new(rpass, node_input)
 
-        node_input = output.inputs[-1]
+    for link in tree.links:
+        if link.to_node == old_output:
+            socket_name = link.to_socket.name
+            new_socket = output.inputs.get(socket_name)
+            if new_socket:
+                tree.links.new(link.from_socket, new_socket)
 
-        tree.links.new(render_pass, node_input)
+    if old_output:
+        output.location = old_output.location
+        tree.nodes.remove(old_output)
+    output.name = "AYON File Output"
 
-    return aov_file_products
+    return [] if multi_exr else aov_file_products
 
 
 def imprint_render_settings(node, data):
@@ -236,9 +260,11 @@ def prepare_rendering(asset_group):
 
     render_product = get_render_product(output_path, name, aov_sep)
     aov_file_product = set_node_tree(
-        output_path, name, aov_sep, ext, multilayer)
+        output_path, render_product, name, aov_sep, ext, multilayer)
 
-    bpy.context.scene.render.filepath = render_product
+    # Clear the render filepath, so that the output is handled only by the
+    # output node in the compositor.
+    bpy.context.scene.render.filepath = ""
 
     render_settings = {
         "render_folder": render_folder,

From fa5b9777a98cca34f5cd5412500f34825a6ff3d8 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 21 Dec 2023 15:07:00 +0000
Subject: [PATCH 02/14] Create a new version of the workfile instead of
 overwriting current one

---
 openpype/hosts/blender/plugins/create/create_render.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/blender/plugins/create/create_render.py b/openpype/hosts/blender/plugins/create/create_render.py
index 7fb3e5eb006..e728579286e 100644
--- a/openpype/hosts/blender/plugins/create/create_render.py
+++ b/openpype/hosts/blender/plugins/create/create_render.py
@@ -1,8 +1,10 @@
 """Create render."""
 import bpy
 
+from openpype.lib import version_up
 from openpype.hosts.blender.api import plugin
 from openpype.hosts.blender.api.render_lib import prepare_rendering
+from openpype.hosts.blender.api.workio import save_file
 
 
 class CreateRenderlayer(plugin.BaseCreator):
@@ -37,6 +39,7 @@ def create(
         # settings. Even the validator to check that the file is saved will
         # detect the file as saved, even if it isn't. The only solution for
         # now it is to force the file to be saved.
-        bpy.ops.wm.save_as_mainfile(filepath=bpy.data.filepath)
+        filepath = version_up(bpy.data.filepath)
+        save_file(filepath, copy=False)
 
         return collection

From 0534c9c55d9eb5d0f193b2c64c3a870b6082a092 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 18 Jan 2024 10:13:24 +0000
Subject: [PATCH 03/14] Fix error when getting setting value in Ayon

---
 openpype/hosts/blender/api/render_lib.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index cdccf138055..904cabfc05f 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -2,6 +2,7 @@
 
 import bpy
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.settings import get_project_settings
 from openpype.pipeline import get_current_project_name
 
@@ -124,13 +125,14 @@ def set_render_passes(settings):
 
     aovs_names = [aov.name for aov in vl.aovs]
     for cp in custom_passes:
-        cp_name = cp[0]
+        cp_name = cp["attribute"] if AYON_SERVER_ENABLED else 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")
+        aov.type = (cp["value"]
+                    if AYON_SERVER_ENABLED else cp[1].get("type", "VALUE"))
 
     return aov_list, custom_passes
 

From 1eb07bcedb97edef9bbf57fa7c605bf85794a33f Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 18 Jan 2024 10:16:05 +0000
Subject: [PATCH 04/14] Added setting to choose render engine

---
 openpype/hosts/blender/api/render_lib.py            | 11 ++++++++++-
 .../blender/server/settings/render_settings.py      | 13 +++++++++++++
 server_addon/blender/server/version.py              |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index 904cabfc05f..06353f8e8b5 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -48,6 +48,14 @@ def get_multilayer(settings):
                     ["multilayer_exr"])
 
 
+def get_renderer(settings):
+    """Get renderer from blender settings."""
+
+    return (settings["blender"]
+                    ["RenderSettings"]
+                    ["renderer"])
+
+
 def get_render_product(output_path, name, aov_sep):
     """
     Generate the path to the render product. Blender interprets the `#`
@@ -254,9 +262,10 @@ def prepare_rendering(asset_group):
     aov_sep = get_aov_separator(settings)
     ext = get_image_format(settings)
     multilayer = get_multilayer(settings)
+    renderer = get_renderer(settings)
 
     set_render_format(ext, multilayer)
-    aov_list, custom_passes = set_render_passes(settings)
+    bpy.context.scene.render.engine = renderer
 
     output_path = Path.joinpath(dirpath, render_folder, file_name)
 
diff --git a/server_addon/blender/server/settings/render_settings.py b/server_addon/blender/server/settings/render_settings.py
index f62013982e8..53cefd145df 100644
--- a/server_addon/blender/server/settings/render_settings.py
+++ b/server_addon/blender/server/settings/render_settings.py
@@ -25,6 +25,13 @@ def image_format_enum():
     ]
 
 
+def renderers_enum():
+    return [
+        {"value": "CYCLES", "label": "Cycles"},
+        {"value": "BLENDER_EEVEE", "label": "Eevee"},
+    ]
+
+
 def aov_list_enum():
     return [
         {"value": "empty", "label": "< none >"},
@@ -83,6 +90,11 @@ class RenderSettingsModel(BaseSettingsModel):
     multilayer_exr: bool = Field(
         title="Multilayer (EXR)"
     )
+    renderer: str = Field(
+        "CYCLES",
+        title="Renderer",
+        enum_resolver=renderers_enum
+    )
     aov_list: list[str] = Field(
         default_factory=list,
         enum_resolver=aov_list_enum,
@@ -104,6 +116,7 @@ class RenderSettingsModel(BaseSettingsModel):
     "aov_separator": "underscore",
     "image_format": "exr",
     "multilayer_exr": True,
+    "renderer": "CYCLES",
     "aov_list": [],
     "custom_passes": []
 }
diff --git a/server_addon/blender/server/version.py b/server_addon/blender/server/version.py
index 1276d0254ff..0a8da882586 100644
--- a/server_addon/blender/server/version.py
+++ b/server_addon/blender/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

From 2f58708f584a63a68ffcbe2c429704dca566f43b Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 18 Jan 2024 10:16:31 +0000
Subject: [PATCH 05/14] Updated aov list

---
 openpype/hosts/blender/api/render_lib.py      | 64 ++++++++++++++-----
 .../server/settings/render_settings.py        | 50 ++++++++++++---
 2 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index 06353f8e8b5..44ee2be208c 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -100,36 +100,69 @@ def set_render_format(ext, multilayer):
         image_settings.file_format = "TIFF"
 
 
-def set_render_passes(settings):
-    aov_list = (settings["blender"]
-                        ["RenderSettings"]
-                        ["aov_list"])
-
-    custom_passes = (settings["blender"]
-                             ["RenderSettings"]
-                             ["custom_passes"])
+def set_render_passes(settings, renderer):
+    aov_list = settings["blender"]["RenderSettings"]["aov_list"]
+    custom_passes = settings["blender"]["RenderSettings"]["custom_passes"]
 
+    # Common passes for both renderers
     vl = bpy.context.view_layer
 
+    # Data Passes
     vl.use_pass_combined = "combined" in aov_list
     vl.use_pass_z = "z" in aov_list
     vl.use_pass_mist = "mist" in aov_list
     vl.use_pass_normal = "normal" in aov_list
+
+    # Light Passes
     vl.use_pass_diffuse_direct = "diffuse_light" in aov_list
     vl.use_pass_diffuse_color = "diffuse_color" in aov_list
     vl.use_pass_glossy_direct = "specular_light" in aov_list
     vl.use_pass_glossy_color = "specular_color" in aov_list
-    vl.eevee.use_pass_volume_direct = "volume_light" in aov_list
     vl.use_pass_emit = "emission" in aov_list
     vl.use_pass_environment = "environment" in aov_list
-    vl.use_pass_shadow = "shadow" in aov_list
     vl.use_pass_ambient_occlusion = "ao" in aov_list
 
-    cycles = vl.cycles
-
-    cycles.denoising_store_passes = "denoising" in aov_list
-    cycles.use_pass_volume_direct = "volume_direct" in aov_list
-    cycles.use_pass_volume_indirect = "volume_indirect" in aov_list
+    # Cryptomatte Passes
+    vl.use_pass_cryptomatte_object = "cryptomatte_object" in aov_list
+    vl.use_pass_cryptomatte_material = "cryptomatte_material" in aov_list
+    vl.use_pass_cryptomatte_asset = "cryptomatte_asset" in aov_list
+
+    if renderer == "BLENDER_EEVEE":
+        # Eevee exclusive passes
+        eevee = vl.eevee
+
+        # Light Passes
+        vl.use_pass_shadow = "shadow" in aov_list
+        eevee.use_pass_volume_direct = "volume_light" in aov_list
+
+        # Effects Passes
+        eevee.use_pass_bloom = "bloom" in aov_list
+        eevee.use_pass_transparent = "transparent" in aov_list
+
+        # Cryptomatte Passes
+        vl.use_pass_cryptomatte_accurate = "cryptomatte_accurate" in aov_list
+    elif renderer == "CYCLES":
+        # Cycles exclusive passes
+        cycles = vl.cycles
+
+        # Data Passes
+        vl.use_pass_position = "position" in aov_list
+        vl.use_pass_vector = "vector" in aov_list
+        vl.use_pass_uv = "uv" in aov_list
+        cycles.denoising_store_passes = "denoising" in aov_list
+        vl.use_pass_object_index = "object_index" in aov_list
+        vl.use_pass_material_index = "material_index" in aov_list
+        cycles.pass_debug_sample_count = "sample_count" in aov_list
+
+        # Light Passes
+        vl.use_pass_diffuse_indirect = "diffuse_indirect" in aov_list
+        vl.use_pass_glossy_indirect = "specular_indirect" in aov_list
+        vl.use_pass_transmission_direct = "transmission_direct" in aov_list
+        vl.use_pass_transmission_indirect = "transmission_indirect" in aov_list
+        vl.use_pass_transmission_color = "transmission_color" in aov_list
+        cycles.use_pass_volume_direct = "volume_light" in aov_list
+        cycles.use_pass_volume_indirect = "volume_indirect" in aov_list
+        cycles.use_pass_shadow_catcher = "shadow" in aov_list
 
     aovs_names = [aov.name for aov in vl.aovs]
     for cp in custom_passes:
@@ -266,6 +299,7 @@ def prepare_rendering(asset_group):
 
     set_render_format(ext, multilayer)
     bpy.context.scene.render.engine = renderer
+    aov_list, custom_passes = set_render_passes(settings, renderer)
 
     output_path = Path.joinpath(dirpath, render_folder, file_name)
 
diff --git a/server_addon/blender/server/settings/render_settings.py b/server_addon/blender/server/settings/render_settings.py
index 53cefd145df..3ab720fc6a1 100644
--- a/server_addon/blender/server/settings/render_settings.py
+++ b/server_addon/blender/server/settings/render_settings.py
@@ -39,18 +39,52 @@ def aov_list_enum():
         {"value": "z", "label": "Z"},
         {"value": "mist", "label": "Mist"},
         {"value": "normal", "label": "Normal"},
-        {"value": "diffuse_light", "label": "Diffuse Light"},
+        {"value": "position", "label": "Position (Cycles Only)"},
+        {"value": "vector", "label": "Vector (Cycles Only)"},
+        {"value": "uv", "label": "UV (Cycles Only)"},
+        {"value": "denoising", "label": "Denoising Data (Cycles Only)"},
+        {"value": "object_index", "label": "Object Index (Cycles Only)"},
+        {"value": "material_index", "label": "Material Index (Cycles Only)"},
+        {"value": "sample_count", "label": "Sample Count (Cycles Only)"},
+        {"value": "diffuse_light", "label": "Diffuse Light/Direct"},
+        {
+            "value": "diffuse_indirect",
+            "label": "Diffuse Indirect (Cycles Only)"
+        },
         {"value": "diffuse_color", "label": "Diffuse Color"},
-        {"value": "specular_light", "label": "Specular Light"},
-        {"value": "specular_color", "label": "Specular Color"},
-        {"value": "volume_light", "label": "Volume Light"},
+        {"value": "specular_light", "label": "Specular (Glossy) Light/Direct"},
+        {
+            "value": "specular_indirect",
+            "label": "Specular (Glossy) Indirect (Cycles Only)"
+        },
+        {"value": "specular_color", "label": "Specular (Glossy) Color"},
+        {
+            "value": "transmission_light",
+            "label": "Transmission Light/Direct (Cycles Only)"
+        },
+        {
+            "value": "transmission_indirect",
+            "label": "Transmission Indirect (Cycles Only)"
+        },
+        {
+            "value": "transmission_color",
+            "label": "Transmission Color (Cycles Only)"
+        },
+        {"value": "volume_light", "label": "Volume Light/Direct"},
+        {"value": "volume_indirect", "label": "Volume Indirect (Cycles Only)"},
         {"value": "emission", "label": "Emission"},
         {"value": "environment", "label": "Environment"},
-        {"value": "shadow", "label": "Shadow"},
+        {"value": "shadow", "label": "Shadow/Shadow Catcher"},
         {"value": "ao", "label": "Ambient Occlusion"},
-        {"value": "denoising", "label": "Denoising"},
-        {"value": "volume_direct", "label": "Direct Volumetric Scattering"},
-        {"value": "volume_indirect", "label": "Indirect Volumetric Scattering"}
+        {"value": "bloom", "label": "Bloom (Eevee Only)"},
+        {"value": "transparent", "label": "Transparent (Eevee Only)"},
+        {"value": "cryptomatte_object", "label": "Cryptomatte Object"},
+        {"value": "cryptomatte_material", "label": "Cryptomatte Material"},
+        {"value": "cryptomatte_asset", "label": "Cryptomatte Asset"},
+        {
+            "value": "cryptomatte_accurate",
+            "label": "Cryptomatte Accurate Mode (Eevee Only)"
+        },
     ]
 
 

From 91f67ca9b0a199e110650fd899d562eae3cdcd16 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 19 Jan 2024 10:00:58 +0000
Subject: [PATCH 06/14] Updated default settings for render passes

---
 server_addon/blender/server/settings/render_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_addon/blender/server/settings/render_settings.py b/server_addon/blender/server/settings/render_settings.py
index 3ab720fc6a1..580547e5101 100644
--- a/server_addon/blender/server/settings/render_settings.py
+++ b/server_addon/blender/server/settings/render_settings.py
@@ -151,6 +151,6 @@ class RenderSettingsModel(BaseSettingsModel):
     "image_format": "exr",
     "multilayer_exr": True,
     "renderer": "CYCLES",
-    "aov_list": [],
+    "aov_list": ["combined"],
     "custom_passes": []
 }

From dd0533ecb36b19988ccb67b0b2e83a50f7090be1 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 19 Jan 2024 10:03:05 +0000
Subject: [PATCH 07/14] Added composite output

---
 openpype/hosts/blender/api/render_lib.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index 44ee2be208c..fc47f5a6590 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -186,12 +186,17 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
 
     comp_layer_type = "CompositorNodeRLayers"
     output_type = "CompositorNodeOutputFile"
+    compositor_type = "CompositorNodeComposite"
 
-    # Get the Render Layers node
+    # Get the Render Layer and Composite nodes
     rl_node = None
+    comp_node = None
     for node in tree.nodes:
         if node.bl_idname == comp_layer_type:
             rl_node = node
+        elif node.bl_idname == compositor_type:
+            comp_node = node
+        if rl_node and comp_node:
             break
 
     # If there's not a Render Layers node, we create it
@@ -242,29 +247,38 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
             pass_name = "rgba" if multi_exr else "beauty"
         else:
             pass_name = rpass.name
-        filepath = f"{name}{aov_sep}{pass_name}.####"
+        filename = f"{name}{aov_sep}{pass_name}.####"
 
-        slots.new(pass_name if multi_exr else filepath)
+        slots.new(pass_name if multi_exr else filename)
 
-        filename = str(output_path / filepath.lstrip("/"))
+        filepath = str(output_path / filename.lstrip("/"))
 
-        aov_file_products.append((rpass.name, filename))
+        aov_file_products.append((rpass.name, filepath))
 
         if not old_output:
             node_input = output.inputs[-1]
             tree.links.new(rpass, node_input)
 
+    # Create a new socket for the composite output
+    pass_name = "composite"
+    filename = f"{name}{aov_sep}{pass_name}.####"
+    comp_socket = slots.new(pass_name if multi_exr else filename)
+    aov_file_products.append(("Composite", filepath))
+
     for link in tree.links:
         if link.to_node == old_output:
             socket_name = link.to_socket.name
             new_socket = output.inputs.get(socket_name)
             if new_socket:
                 tree.links.new(link.from_socket, new_socket)
+        elif comp_node and link.to_node == comp_node:
+            tree.links.new(link.from_socket, comp_socket)
 
     if old_output:
         output.location = old_output.location
         tree.nodes.remove(old_output)
     output.name = "AYON File Output"
+    output.label = "AYON File Output"
 
     return [] if multi_exr else aov_file_products
 

From c911c67dae109a3c769fa4fe584f925f3afe7a2e Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 19 Jan 2024 11:04:25 +0000
Subject: [PATCH 08/14] Updated OpenPype Settings

---
 .../defaults/project_settings/blender.json    |  3 +-
 .../schema_project_blender.json               | 43 +++++++++++++++----
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json
index 385e97ef91e..48f3ef8ef0e 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": [],
+        "renderer": "CYCLES",
+        "aov_list": ["combined"],
         "custom_passes": []
     },
     "workfile_builder": {
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 535d9434a39..bbed881ab0b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
@@ -103,6 +103,17 @@
                     "type": "label",
                     "label": "Note: Multilayer EXR is only used when output format type set to EXR."
                 },
+                {
+                    "key": "renderer",
+                    "label": "Renderer",
+                    "type": "enum",
+                    "multiselection": false,
+                    "defaults": "CYCLES",
+                    "enum_items": [
+                        {"CYCLES": "Cycles"},
+                        {"BLENDER_EEVEE": "Eevee"}
+                    ]
+                },
                 {
                     "key": "aov_list",
                     "label": "AOVs to create",
@@ -115,18 +126,34 @@
                         {"z": "Z"},
                         {"mist": "Mist"},
                         {"normal": "Normal"},
-                        {"diffuse_light": "Diffuse Light"},
+                        {"position": "Position (Cycles Only)"},
+                        {"vector": "Vector (Cycles Only)"},
+                        {"uv": "UV (Cycles Only)"},
+                        {"denoising": "Denoising Data (Cycles Only)"},
+                        {"object_index": "Object Index (Cycles Only)"},
+                        {"material_index": "Material Index (Cycles Only)"},
+                        {"sample_count": "Sample Count (Cycles Only)"},
+                        {"diffuse_light": "Diffuse Light/Direct"},
+                        {"diffuse_indirect": "Diffuse Indirect (Cycles Only)"},
                         {"diffuse_color": "Diffuse Color"},
-                        {"specular_light": "Specular Light"},
-                        {"specular_color": "Specular Color"},
-                        {"volume_light": "Volume Light"},
+                        {"specular_light": "Specular (Glossy) Light/Direct"},
+                        {"specular_indirect": "Specular (Glossy) Indirect (Cycles Only)"},
+                        {"specular_color": "Specular (Glossy) Color"},
+                        {"transmission_light": "Transmission Light/Direct (Cycles Only)"},
+                        {"transmission_indirect": "Transmission Indirect (Cycles Only)"},
+                        {"transmission_color": "Transmission Color (Cycles Only)"},
+                        {"volume_light": "Volume Light/Direct"},
+                        {"volume_indirect": "Volume Indirect (Cycles Only)"},
                         {"emission": "Emission"},
                         {"environment": "Environment"},
-                        {"shadow": "Shadow"},
+                        {"shadow": "Shadow/Shadow Catcher"},
                         {"ao": "Ambient Occlusion"},
-                        {"denoising": "Denoising"},
-                        {"volume_direct": "Direct Volumetric Scattering"},
-                        {"volume_indirect": "Indirect Volumetric Scattering"}
+                        {"bloom": "Bloom (Eevee Only)"},
+                        {"transparent": "Transparent (Eevee Only)"},
+                        {"cryptomatte_object": "Cryptomatte Object"},
+                        {"cryptomatte_material": "Cryptomatte Material"},
+                        {"cryptomatte_asset": "Cryptomatte Asset"},
+                        {"cryptomatte_accurate": "Cryptomatte Accurate Mode (Eevee Only)"}
                     ]
                 },
                 {

From 44282f86df721a271a291bc005abd07f896acb49 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Thu, 1 Feb 2024 10:42:34 +0000
Subject: [PATCH 09/14] Fixed deadline validator to check compositor tree
 output

---
 .../publish/validate_deadline_publish.py      | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py b/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
index bb243f08cc0..f7860dd75d7 100644
--- a/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
+++ b/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
@@ -28,15 +28,27 @@ class ValidateDeadlinePublish(pyblish.api.InstancePlugin,
     def process(self, instance):
         if not self.is_active(instance.data):
             return
+
+        tree = bpy.context.scene.node_tree
+        output_type = "CompositorNodeOutputFile"
+        output_node = None
+        # Remove all output nodes that inlcude "AYON" in the name.
+        # There should be only one.
+        for node in tree.nodes:
+            if node.bl_idname == output_type and "AYON" in node.name:
+                output_node = node
+                break
+        if not output_node:
+            raise PublishValidationError(
+                "No output node found in the compositor tree."
+            )
         filepath = bpy.data.filepath
         file = os.path.basename(filepath)
         filename, ext = os.path.splitext(file)
-        if filename not in bpy.context.scene.render.filepath:
+        if filename not in output_node.base_path:
             raise PublishValidationError(
-                "Render output folder "
-                "doesn't match the blender scene name! "
-                "Use Repair action to "
-                "fix the folder file path."
+                "Render output folder doesn't match the blender scene name! "
+                "Use Repair action to fix the folder file path."
             )
 
     @classmethod

From 78a3ec2118c9963e31ea0b4ca2907d0b84a14b39 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Mon, 5 Feb 2024 12:06:19 +0000
Subject: [PATCH 10/14] Fixed issue with double entries in the json manifest

---
 openpype/hosts/blender/api/render_lib.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index fc47f5a6590..c2792103e59 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -244,7 +244,9 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
     # and link it
     for rpass in passes:
         if rpass.name == "Image":
-            pass_name = "rgba" if multi_exr else "beauty"
+            if not multi_exr:
+                continue
+            pass_name = "rgba"
         else:
             pass_name = rpass.name
         filename = f"{name}{aov_sep}{pass_name}.####"
@@ -263,6 +265,7 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
     pass_name = "composite"
     filename = f"{name}{aov_sep}{pass_name}.####"
     comp_socket = slots.new(pass_name if multi_exr else filename)
+    filepath = str(output_path / filename.lstrip("/"))
     aov_file_products.append(("Composite", filepath))
 
     for link in tree.links:

From f2429680ff5aa68b358ececeba02d24e9d86ad0c Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Tue, 6 Feb 2024 15:43:18 +0000
Subject: [PATCH 11/14] Fix old links and duplicated entries in the manifest

---
 openpype/hosts/blender/api/render_lib.py | 116 ++++++++++++-----------
 1 file changed, 63 insertions(+), 53 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index c2792103e59..17b9d926ecf 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -178,6 +178,14 @@ def set_render_passes(settings, renderer):
     return aov_list, custom_passes
 
 
+def _create_aov_slot(name, aov_sep, slots, rpass_name, multi_exr, output_path):
+    filename = f"{name}{aov_sep}{rpass_name}.####"
+    slot = slots.new(rpass_name if multi_exr else filename)
+    filepath = str(output_path / filename.lstrip("/"))
+
+    return slot, filepath
+
+
 def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
     # Set the scene to use the compositor node tree to render
     bpy.context.scene.use_nodes = True
@@ -188,40 +196,34 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
     output_type = "CompositorNodeOutputFile"
     compositor_type = "CompositorNodeComposite"
 
-    # Get the Render Layer and Composite nodes
-    rl_node = None
-    comp_node = None
+    # Get the Render Layer, Composite and the previous output nodes
+    render_layer_node = None
+    composite_node = None
+    old_output_node = None
     for node in tree.nodes:
         if node.bl_idname == comp_layer_type:
-            rl_node = node
+            render_layer_node = node
         elif node.bl_idname == compositor_type:
-            comp_node = node
-        if rl_node and comp_node:
+            composite_node = node
+        elif node.bl_idname == output_type and "AYON" in node.name:
+            old_output_node = node
+        if render_layer_node and composite_node and old_output_node:
             break
 
     # If there's not a Render Layers node, we create it
-    if not rl_node:
-        rl_node = tree.nodes.new(comp_layer_type)
+    if not render_layer_node:
+        render_layer_node = tree.nodes.new(comp_layer_type)
 
     # Get the enabled output sockets, that are the active passes for the
     # render.
     # We also exclude some layers.
-    exclude_sockets = ["Alpha", "Noisy Image"]
+    exclude_sockets = ["Image", "Alpha", "Noisy Image"]
     passes = [
         socket
-        for socket in rl_node.outputs
+        for socket in render_layer_node.outputs
         if socket.enabled and socket.name not in exclude_sockets
     ]
 
-    old_output = None
-
-    # Remove all output nodes that inlcude "AYON" in the name.
-    # There should be only one.
-    for node in tree.nodes:
-        if node.bl_idname == output_type and "AYON" in node.name:
-            old_output = node
-            break
-
     # Create a new output node
     output = tree.nodes.new(output_type)
 
@@ -240,46 +242,54 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
 
     aov_file_products = []
 
-    # For each active render pass, we add a new socket to the output node
-    # and link it
-    for rpass in passes:
-        if rpass.name == "Image":
-            if not multi_exr:
-                continue
-            pass_name = "rgba"
-        else:
-            pass_name = rpass.name
-        filename = f"{name}{aov_sep}{pass_name}.####"
+    old_links = {
+        link.from_socket.name: link for link in tree.links
+        if link.to_node == old_output_node}
 
-        slots.new(pass_name if multi_exr else filename)
-
-        filepath = str(output_path / filename.lstrip("/"))
-
-        aov_file_products.append((rpass.name, filepath))
-
-        if not old_output:
-            node_input = output.inputs[-1]
-            tree.links.new(rpass, node_input)
+    # Create a new socket for the beauty output
+    pass_name = "rgba" if multi_exr else "beauty"
+    slot, _ = _create_aov_slot(
+        name, aov_sep, slots, pass_name, multi_exr, output_path)
+    tree.links.new(render_layer_node.outputs["Image"], slot)
 
     # Create a new socket for the composite output
     pass_name = "composite"
-    filename = f"{name}{aov_sep}{pass_name}.####"
-    comp_socket = slots.new(pass_name if multi_exr else filename)
-    filepath = str(output_path / filename.lstrip("/"))
+    comp_socket, filepath = _create_aov_slot(
+        name, aov_sep, slots, pass_name, multi_exr, output_path)
     aov_file_products.append(("Composite", filepath))
 
-    for link in tree.links:
-        if link.to_node == old_output:
-            socket_name = link.to_socket.name
-            new_socket = output.inputs.get(socket_name)
-            if new_socket:
-                tree.links.new(link.from_socket, new_socket)
-        elif comp_node and link.to_node == comp_node:
-            tree.links.new(link.from_socket, comp_socket)
-
-    if old_output:
-        output.location = old_output.location
-        tree.nodes.remove(old_output)
+    # For each active render pass, we add a new socket to the output node
+    # and link it
+    for rpass in passes:
+        slot, filepath = _create_aov_slot(
+            name, aov_sep, slots, rpass.name, multi_exr, output_path)
+        aov_file_products.append((rpass.name, filepath))
+
+        # If the rpass was not connected with the old output node, we connect
+        # it with the new one.
+        if not old_links.get(rpass.name):
+            tree.links.new(rpass, slot)
+
+    for link in list(old_links.values()):
+        # Check if the socket is still available in the new output node.
+        socket = output.inputs.get(link.to_socket.name)
+        # If it is, we connect it with the new output node.
+        if socket:
+            tree.links.new(link.from_socket, socket)
+        # Then, we remove the old link.
+        tree.links.remove(link)
+
+    # If there's a composite node, we connect its input with the new output
+    if composite_node:
+        for link in tree.links:
+            if link.to_node == composite_node:
+                tree.links.new(link.from_socket, comp_socket)
+                break
+
+    if old_output_node:
+        output.location = old_output_node.location
+        tree.nodes.remove(old_output_node)
+
     output.name = "AYON File Output"
     output.label = "AYON File Output"
 

From bcd216946859bfdb38b2d88df4541c9fe6319da7 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Wed, 14 Feb 2024 10:11:37 +0000
Subject: [PATCH 12/14] Cast aov_list to set to improve performance

---
 openpype/hosts/blender/api/render_lib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index 17b9d926ecf..bb35dd44ea7 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -101,7 +101,7 @@ def set_render_format(ext, multilayer):
 
 
 def set_render_passes(settings, renderer):
-    aov_list = settings["blender"]["RenderSettings"]["aov_list"]
+    aov_list = set(settings["blender"]["RenderSettings"]["aov_list"])
     custom_passes = settings["blender"]["RenderSettings"]["custom_passes"]
 
     # Common passes for both renderers
@@ -175,7 +175,7 @@ def set_render_passes(settings, renderer):
         aov.type = (cp["value"]
                     if AYON_SERVER_ENABLED else cp[1].get("type", "VALUE"))
 
-    return aov_list, custom_passes
+    return list(aov_list), custom_passes
 
 
 def _create_aov_slot(name, aov_sep, slots, rpass_name, multi_exr, output_path):

From 6002da8235c32ac74eeb5e7c40f5153b8326f59d Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Wed, 14 Feb 2024 10:18:52 +0000
Subject: [PATCH 13/14] Added an option to disable composite output

---
 openpype/hosts/blender/api/render_lib.py      | 29 ++++++++++++++-----
 .../defaults/project_settings/blender.json    |  1 +
 .../schema_project_blender.json               |  5 ++++
 .../server/settings/render_settings.py        |  4 +++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index bb35dd44ea7..c09cfce5027 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -56,6 +56,14 @@ def get_renderer(settings):
                     ["renderer"])
 
 
+def get_compositing(settings):
+    """Get compositing from blender settings."""
+
+    return (settings["blender"]
+                    ["RenderSettings"]
+                    ["compositing"])
+
+
 def get_render_product(output_path, name, aov_sep):
     """
     Generate the path to the render product. Blender interprets the `#`
@@ -186,7 +194,9 @@ def _create_aov_slot(name, aov_sep, slots, rpass_name, multi_exr, output_path):
     return slot, filepath
 
 
-def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
+def set_node_tree(
+    output_path, render_product, name, aov_sep, ext, multilayer, compositing
+):
     # Set the scene to use the compositor node tree to render
     bpy.context.scene.use_nodes = True
 
@@ -252,11 +262,12 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
         name, aov_sep, slots, pass_name, multi_exr, output_path)
     tree.links.new(render_layer_node.outputs["Image"], slot)
 
-    # Create a new socket for the composite output
-    pass_name = "composite"
-    comp_socket, filepath = _create_aov_slot(
-        name, aov_sep, slots, pass_name, multi_exr, output_path)
-    aov_file_products.append(("Composite", filepath))
+    if compositing:
+        # Create a new socket for the composite output
+        pass_name = "composite"
+        comp_socket, filepath = _create_aov_slot(
+            name, aov_sep, slots, pass_name, multi_exr, output_path)
+        aov_file_products.append(("Composite", filepath))
 
     # For each active render pass, we add a new socket to the output node
     # and link it
@@ -280,7 +291,7 @@ def set_node_tree(output_path, render_product, name, aov_sep, ext, multilayer):
         tree.links.remove(link)
 
     # If there's a composite node, we connect its input with the new output
-    if composite_node:
+    if compositing and composite_node:
         for link in tree.links:
             if link.to_node == composite_node:
                 tree.links.new(link.from_socket, comp_socket)
@@ -323,6 +334,7 @@ def prepare_rendering(asset_group):
     ext = get_image_format(settings)
     multilayer = get_multilayer(settings)
     renderer = get_renderer(settings)
+    compositing = get_compositing(settings)
 
     set_render_format(ext, multilayer)
     bpy.context.scene.render.engine = renderer
@@ -332,7 +344,8 @@ def prepare_rendering(asset_group):
 
     render_product = get_render_product(output_path, name, aov_sep)
     aov_file_product = set_node_tree(
-        output_path, render_product, name, aov_sep, ext, multilayer)
+        output_path, render_product, name, aov_sep,
+        ext, multilayer, compositing)
 
     # Clear the render filepath, so that the output is handled only by the
     # output node in the compositor.
diff --git a/openpype/settings/defaults/project_settings/blender.json b/openpype/settings/defaults/project_settings/blender.json
index 48f3ef8ef0e..03a5400ced3 100644
--- a/openpype/settings/defaults/project_settings/blender.json
+++ b/openpype/settings/defaults/project_settings/blender.json
@@ -23,6 +23,7 @@
         "image_format": "exr",
         "multilayer_exr": true,
         "renderer": "CYCLES",
+        "compositing": true,
         "aov_list": ["combined"],
         "custom_passes": []
     },
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 bbed881ab0b..13e460b74cf 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
@@ -114,6 +114,11 @@
                         {"BLENDER_EEVEE": "Eevee"}
                     ]
                 },
+                {
+                    "key": "compositing",
+                    "type": "boolean",
+                    "label": "Enable Compositing"
+                },
                 {
                     "key": "aov_list",
                     "label": "AOVs to create",
diff --git a/server_addon/blender/server/settings/render_settings.py b/server_addon/blender/server/settings/render_settings.py
index a1f6d3114a8..f992ea6fcc8 100644
--- a/server_addon/blender/server/settings/render_settings.py
+++ b/server_addon/blender/server/settings/render_settings.py
@@ -127,6 +127,9 @@ class RenderSettingsModel(BaseSettingsModel):
         title="Renderer",
         enum_resolver=renderers_enum
     )
+    compositing: bool = SettingsField(
+        title="Enable Compositing"
+    )
     aov_list: list[str] = SettingsField(
         default_factory=list,
         enum_resolver=aov_list_enum,
@@ -149,6 +152,7 @@ class RenderSettingsModel(BaseSettingsModel):
     "image_format": "exr",
     "multilayer_exr": True,
     "renderer": "CYCLES",
+    "compositing": True,
     "aov_list": ["combined"],
     "custom_passes": []
 }

From e1f5bdb5a9a2c7225583ba7b2a164f548d76d8d4 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Tue, 20 Feb 2024 11:27:12 +0000
Subject: [PATCH 14/14] Removed redundant option in aov list

---
 .../entities/schemas/projects_schema/schema_project_blender.json | 1 -
 1 file changed, 1 deletion(-)

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 13e460b74cf..2ffdc6070dc 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_blender.json
@@ -126,7 +126,6 @@
                     "multiselection": true,
                     "defaults": "empty",
                     "enum_items": [
-                        {"empty": "< empty >"},
                         {"combined": "Combined"},
                         {"z": "Z"},
                         {"mist": "Mist"},