From 059589890e0d91eea4bd89095b02fe5de9f44fc8 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Wed, 15 May 2024 19:29:27 +0200
Subject: [PATCH 01/19] #419: enhancement: add custom format set from custom
 settings for Nuke

---
 openpype/hosts/nuke/api/lib.py      | 72 ++++++++++++++++++++++++++++-
 openpype/hosts/nuke/api/pipeline.py |  6 ++-
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index c06263a8b77..50a9930e156 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2597,13 +2597,83 @@ def make_format_string(self, **kwargs):
     def set_context_settings(self):
         os.environ["OP_NUKE_SKIP_SAVE_EVENT"] = "True"
         # replace reset resolution from avalon core to pype's
-        #self.reset_resolution()
+        self.reset_resolution()
         # replace reset resolution from avalon core to pype's
         self.reset_frame_range_handles()
         # add colorspace menu item
         self.set_colorspace()
         del os.environ["OP_NUKE_SKIP_SAVE_EVENT"]
 
+    def set_custom_settings(self,):
+        project_name = get_current_project_name()
+        project_settings = get_project_settings(project_name)
+
+        custom_settings = project_settings.get('fix_custom_settings')
+        if not custom_settings:
+            log.warning("Can't access to quad custom settings. Custom settings will not be applied.")
+            return
+
+        self.set_workfile_overrides(custom_settings, project_name)
+
+    def set_workfile_overrides(self, custom_settings, project_name):
+        resolution_overrides = custom_settings.get("general", []).get("working_resolution_overrides", None)
+        if not resolution_overrides:
+            log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
+            return
+
+        import re
+        regex_str = f'(nuke)[\/.]({nuke.NUKE_VERSION_MAJOR})[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MINOR})'
+        application_regex = re.compile(regex_str)
+
+        overrides_group = None
+        for resolution_overrides_set in resolution_overrides:
+            for application in resolution_overrides_set.get('applications', []):
+                match = application_regex.search(application)
+                if match:
+                    overrides_group = resolution_overrides_set
+
+        if not overrides_group:
+            log.warning("Can't find overrides group that fit application. Abort.")
+
+        asset_data = self._asset_entity["data"]
+        format_data = {"419-enhancement-dissocier-res-de-travail-et-res-final"
+            "width": int(overrides_group.get('working_resolution_width')),
+            "height": int(overrides_group.get('working_resolution_height')),
+            "pixel_aspect": asset_data.get(
+                'pixelAspect',
+                asset_data.get('pixel_aspect', 1)),
+            "name": f"{project_name}_{match.group()}"
+        }
+
+        if any(x_ for x_ in format_data.values() if x_ is None):
+            msg = ("Missing override from custom settings."
+                   "\nContact your supervisor!."
+                   "\n\nWidth: `{width}`"
+                   "\nHeight: `{height}`"
+                   "\nPixel Aspect: `{pixel_aspect}`").format(**format_data)
+            log.error(msg)
+            nuke.message(msg)
+
+        existing_format = None
+        for format in nuke.formats():
+            if format_data["name"] == format.name():
+                existing_format = format
+                break
+
+        if existing_format:
+            # Enforce existing format to be correct.
+            existing_format.setWidth(format_data["width"])
+            existing_format.setHeight(format_data["height"])
+            existing_format.setPixelAspect(format_data["pixel_aspect"])
+        else:
+            format_string = self.make_format_string(**format_data)
+            log.info("Creating new format: {}".format(format_string))
+            nuke.addFormat(format_string)
+
+        nuke.root()["format"].setValue(format_data["name"])
+        log.info(f"Format is set with values : {format_data}")
+
+
     def set_favorites(self):
         from .utils import set_context_favorites
 
diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 8d185edf17b..420c9d0d32b 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -175,11 +175,13 @@ def add_nuke_callbacks():
 
     # set checker for last versions on loaded containers
     nuke.addOnScriptLoad(check_inventory_versions)
-    nuke.addOnScriptSave(check_inventory_versions)
 
     # set apply all workfile settings on script load and save
     nuke.addOnScriptLoad(WorkfileSettings().set_context_settings)
 
+    # set apply all custom settings on script load and save
+    nuke.addOnScriptLoad(workfile_settings.set_custom_settings)
+
     # Emit events
     nuke.addOnCreate(_on_scene_open, nodeClass="Root")
     nuke.addOnScriptSave(_on_scene_save)
@@ -191,6 +193,8 @@ def add_nuke_callbacks():
 
     log.info("Added Nuke callbacks ...")
 
+def test():
+    nuke.message('test')
 
 def reload_config():
     """Attempt to reload pipeline at run-time.

From 21396cf83d755e2e2a38ab795af9cc2dff41634e Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Thu, 16 May 2024 10:52:32 +0200
Subject: [PATCH 02/19] #419: bugfix: fix typo issue

---
 openpype/hosts/nuke/api/lib.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 50a9930e156..b05fffba14c 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2543,6 +2543,8 @@ def reset_resolution(self):
             "name": project_name
         }
 
+        log.info(format_data)
+
         if any(x_ for x_ in format_data.values() if x_ is None):
             msg = ("Missing set shot attributes in DB."
                    "\nContact your supervisor!."
@@ -2636,7 +2638,7 @@ def set_workfile_overrides(self, custom_settings, project_name):
             log.warning("Can't find overrides group that fit application. Abort.")
 
         asset_data = self._asset_entity["data"]
-        format_data = {"419-enhancement-dissocier-res-de-travail-et-res-final"
+        format_data = {
             "width": int(overrides_group.get('working_resolution_width')),
             "height": int(overrides_group.get('working_resolution_height')),
             "pixel_aspect": asset_data.get(

From 97eadd82a613bf2e302e962a2b007ec6635e0e59 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Thu, 16 May 2024 11:32:50 +0200
Subject: [PATCH 03/19] #419: enhancement: add resolution override for After
 Effects

---
 openpype/hosts/aftereffects/api/lib.py | 44 +++++++++++++++++++++++++-
 openpype/hosts/nuke/api/lib.py         |  3 +-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index e8352c382b5..62123c5b5cf 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -4,7 +4,7 @@
 import contextlib
 import logging
 
-from openpype.pipeline.context_tools import get_current_context
+from openpype.pipeline.context_tools import get_current_context, get_project_settings
 from openpype.client import get_asset_by_name
 from .ws_stub import get_stub
 
@@ -114,6 +114,38 @@ def get_asset_settings(asset_doc):
     }
 
 
+def get_custom_settings(project_name):
+    project_settings = get_project_settings(project_name)
+    custom_settings = project_settings.get('fix_custom_settings')
+    if not custom_settings:
+        log.warning("Can't access to quad custom settings. Custom settings will not be applied.")
+        return
+
+    return custom_settings
+
+def get_workfile_overrides(custom_settings):
+    resolution_overrides = custom_settings.get("general", []).get("working_resolution_overrides", None)
+    if not resolution_overrides:
+        log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
+        return
+
+    app_year = f"20{get_stub().get_app_version().split('.')[0]}"
+    regex_str = f'(aftereffects)[\\\/\.\-\_\:]({app_year}$)'
+    application_regex = re.compile(regex_str)
+
+    overrides_group = None
+    for resolution_overrides_set in resolution_overrides:
+        for application in resolution_overrides_set.get('applications', []):
+            match = application_regex.search(application)
+            if match:
+                overrides_group = resolution_overrides_set
+
+    if not overrides_group:
+        log.warning("Can't find overrides group that fit application. Abort.")
+
+    return overrides_group
+
+
 def set_settings(frames, resolution, comp_ids=None, print_msg=True):
     """Sets number of frames and resolution to selected comps.
 
@@ -130,6 +162,7 @@ def set_settings(frames, resolution, comp_ids=None, print_msg=True):
     asset_doc = get_asset_by_name(current_context["project_name"],
                                   current_context["asset_name"])
     settings = get_asset_settings(asset_doc)
+    custom_settings = get_custom_settings(current_context["project_name"])
 
     msg = ''
     if frames:
@@ -138,7 +171,16 @@ def set_settings(frames, resolution, comp_ids=None, print_msg=True):
         fps = settings["fps"]
         msg += f"frame start:{frame_start}, duration:{frames_duration}, "\
                f"fps:{fps}"
+
     if resolution:
+
+        workfile_overrides = get_workfile_overrides(custom_settings)
+        if workfile_overrides:
+            override_width = workfile_overrides.get('working_resolution_width')
+            if override_width: settings["resolutionWidth"] = override_width
+            override_height = workfile_overrides.get('working_resolution_height')
+            if override_height: settings["resolutionHeight"] = override_height
+
         width = settings["resolutionWidth"]
         height = settings["resolutionHeight"]
         msg += f"width:{width} and height:{height}"
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index b05fffba14c..09f1b1e1b0f 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2623,8 +2623,7 @@ def set_workfile_overrides(self, custom_settings, project_name):
             log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
             return
 
-        import re
-        regex_str = f'(nuke)[\/.]({nuke.NUKE_VERSION_MAJOR})[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MINOR})'
+        regex_str = f'(nuke)[\/\.]({nuke.NUKE_VERSION_MAJOR})[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MINOR})'
         application_regex = re.compile(regex_str)
 
         overrides_group = None

From aafef3e639c3b29c77e251e9c2eee79f185089e4 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Thu, 16 May 2024 11:36:45 +0200
Subject: [PATCH 04/19] #419: enhancement: update regex for nuke

---
 openpype/hosts/nuke/api/lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 09f1b1e1b0f..159fe7f5898 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2623,7 +2623,7 @@ def set_workfile_overrides(self, custom_settings, project_name):
             log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
             return
 
-        regex_str = f'(nuke)[\/\.]({nuke.NUKE_VERSION_MAJOR})[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MINOR})'
+        regex_str = f'(nuke)[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MAJOR})[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MINOR})'
         application_regex = re.compile(regex_str)
 
         overrides_group = None

From 9edab19179bd18632cfba7bccdf777cf43543c90 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Thu, 16 May 2024 14:18:47 +0200
Subject: [PATCH 05/19] #419: enhancement: add missing break

---
 openpype/hosts/aftereffects/api/lib.py | 1 +
 openpype/hosts/nuke/api/lib.py         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index 62123c5b5cf..9e9d4be3e01 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -139,6 +139,7 @@ def get_workfile_overrides(custom_settings):
             match = application_regex.search(application)
             if match:
                 overrides_group = resolution_overrides_set
+                break
 
     if not overrides_group:
         log.warning("Can't find overrides group that fit application. Abort.")
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 159fe7f5898..ac8e6d6ceb7 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2632,6 +2632,7 @@ def set_workfile_overrides(self, custom_settings, project_name):
                 match = application_regex.search(application)
                 if match:
                     overrides_group = resolution_overrides_set
+                    break
 
         if not overrides_group:
             log.warning("Can't find overrides group that fit application. Abort.")

From ea745e225163f58d47d4fdac7790526a2a9e3176 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Thu, 16 May 2024 14:30:49 +0200
Subject: [PATCH 06/19] #419: bugfix: moved override group getter in separate
 function

---
 openpype/hosts/aftereffects/api/lib.py | 18 ++++++++++--------
 openpype/hosts/nuke/api/lib.py         | 17 +++++++++--------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index 9e9d4be3e01..d4843109bf3 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -133,20 +133,22 @@ def get_workfile_overrides(custom_settings):
     regex_str = f'(aftereffects)[\\\/\.\-\_\:]({app_year}$)'
     application_regex = re.compile(regex_str)
 
-    overrides_group = None
-    for resolution_overrides_set in resolution_overrides:
-        for application in resolution_overrides_set.get('applications', []):
-            match = application_regex.search(application)
-            if match:
-                overrides_group = resolution_overrides_set
-                break
-
+    overrides_group = _get_override_group(resolution_overrides, application_regex)
     if not overrides_group:
         log.warning("Can't find overrides group that fit application. Abort.")
 
     return overrides_group
 
 
+def _get_override_group(resolution_overrides, application_regex):
+    for resolution_overrides_set in resolution_overrides:
+        for application in resolution_overrides_set.get('applications', []):
+            match = application_regex.search(application)
+            if match: return resolution_overrides_set
+
+    return None, None
+
+
 def set_settings(frames, resolution, comp_ids=None, print_msg=True):
     """Sets number of frames and resolution to selected comps.
 
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index ac8e6d6ceb7..4a88d483c0f 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2626,13 +2626,7 @@ def set_workfile_overrides(self, custom_settings, project_name):
         regex_str = f'(nuke)[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MAJOR})[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MINOR})'
         application_regex = re.compile(regex_str)
 
-        overrides_group = None
-        for resolution_overrides_set in resolution_overrides:
-            for application in resolution_overrides_set.get('applications', []):
-                match = application_regex.search(application)
-                if match:
-                    overrides_group = resolution_overrides_set
-                    break
+        overrides_group, application_name = self._get_override_group(resolution_overrides, application_regex)
 
         if not overrides_group:
             log.warning("Can't find overrides group that fit application. Abort.")
@@ -2644,7 +2638,7 @@ def set_workfile_overrides(self, custom_settings, project_name):
             "pixel_aspect": asset_data.get(
                 'pixelAspect',
                 asset_data.get('pixel_aspect', 1)),
-            "name": f"{project_name}_{match.group()}"
+            "name": f"{project_name}_{application_name}"
         }
 
         if any(x_ for x_ in format_data.values() if x_ is None):
@@ -2675,6 +2669,13 @@ def set_workfile_overrides(self, custom_settings, project_name):
         nuke.root()["format"].setValue(format_data["name"])
         log.info(f"Format is set with values : {format_data}")
 
+    def _get_override_group(self, resolution_overrides, application_regex):
+        for resolution_overrides_set in resolution_overrides:
+            for application in resolution_overrides_set.get('applications', []):
+                match = application_regex.search(application)
+                if match: return resolution_overrides_set, match.group()
+
+        return None, None
 
     def set_favorites(self):
         from .utils import set_context_favorites

From d7ba7ec306ae5768d038a66f9f0a27516a21b30c Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Thu, 16 May 2024 14:56:19 +0200
Subject: [PATCH 07/19] #419: bugfix: check for nuke environment variables to
 determine correct application

---
 openpype/hosts/nuke/api/lib.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 4a88d483c0f..ac00af1afe8 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2623,7 +2623,10 @@ def set_workfile_overrides(self, custom_settings, project_name):
             log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
             return
 
-        regex_str = f'(nuke)[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MAJOR})[\\\/\.\-\_\:]({nuke.NUKE_VERSION_MINOR})'
+        application_name = self._get_application_name()
+        major_version = nuke.NUKE_VERSION_MAJOR
+        minor_version = nuke.NUKE_VERSION_MINOR
+        regex_str = f'({application_name})[\\\/\.\-\_\:]({major_version})[\\\/\.\-\_\:]({minor_version})'
         application_regex = re.compile(regex_str)
 
         overrides_group, application_name = self._get_override_group(resolution_overrides, application_regex)
@@ -2669,6 +2672,11 @@ def set_workfile_overrides(self, custom_settings, project_name):
         nuke.root()["format"].setValue(format_data["name"])
         log.info(f"Format is set with values : {format_data}")
 
+    def _get_application_name(self):
+        return  "nukex" if nuke.env['nukex'] \
+            else "studio" if nuke.env["studio"] \
+            else "nuke"
+
     def _get_override_group(self, resolution_overrides, application_regex):
         for resolution_overrides_set in resolution_overrides:
             for application in resolution_overrides_set.get('applications', []):

From 2b480eab4629658fc25662b11416bec5a8c69694 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Fri, 17 May 2024 15:48:49 +0200
Subject: [PATCH 08/19] #419: enhancement: add custom resolution set button in
 nuke menu

---
 openpype/hosts/nuke/api/lib.py      | 20 +++++++++++++-------
 openpype/hosts/nuke/api/pipeline.py |  6 +++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index ac00af1afe8..3d19206b403 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2606,18 +2606,24 @@ def set_context_settings(self):
         self.set_colorspace()
         del os.environ["OP_NUKE_SKIP_SAVE_EVENT"]
 
-    def set_custom_settings(self,):
-        project_name = get_current_project_name()
-        project_settings = get_project_settings(project_name)
-
-        custom_settings = project_settings.get('fix_custom_settings')
+    def set_custom_resolution(self):
+        custom_settings = self.get_custom_settings()
         if not custom_settings:
             log.warning("Can't access to quad custom settings. Custom settings will not be applied.")
             return
 
-        self.set_workfile_overrides(custom_settings, project_name)
+        self.set_workfile_overrides(
+            custom_settings=custom_settings
+        )
 
-    def set_workfile_overrides(self, custom_settings, project_name):
+    def get_custom_settings(self):
+        project_name = get_current_project_name()
+        project_settings = get_project_settings(project_name)
+
+        return project_settings.get('fix_custom_settings')
+
+    def set_workfile_overrides(self, custom_settings):
+        project_name = get_current_project_name()
         resolution_overrides = custom_settings.get("general", []).get("working_resolution_overrides", None)
         if not resolution_overrides:
             log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 420c9d0d32b..9d24c931be8 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -180,7 +180,7 @@ def add_nuke_callbacks():
     nuke.addOnScriptLoad(WorkfileSettings().set_context_settings)
 
     # set apply all custom settings on script load and save
-    nuke.addOnScriptLoad(workfile_settings.set_custom_settings)
+    nuke.addOnScriptLoad(workfile_settings.set_custom_resolution)
 
     # Emit events
     nuke.addOnCreate(_on_scene_open, nodeClass="Root")
@@ -306,6 +306,10 @@ def _install_menu():
         "Set Resolution",
         lambda: WorkfileSettings().reset_resolution()
     )
+    menu.addCommand(
+        "Set Custom Resolution",
+        lambda: WorkfileSettings().set_custom_resolution()
+    )
     menu.addCommand(
         "Set Frame Range",
         lambda: WorkfileSettings().reset_frame_range_handles()

From 006a59b450b6ceb8a7ad909da45ab38898204215 Mon Sep 17 00:00:00 2001
From: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Date: Wed, 22 May 2024 14:43:40 +0200
Subject: [PATCH 09/19] return correct node in _update_renderlayer_instance
 method (quadproduction/issues#287)

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

diff --git a/openpype/hosts/maya/api/plugin.py b/openpype/hosts/maya/api/plugin.py
index aefafa90918..21d54a11eb1 100644
--- a/openpype/hosts/maya/api/plugin.py
+++ b/openpype/hosts/maya/api/plugin.py
@@ -524,9 +524,9 @@ def _update_renderlayer_instance(self, node, layer_name, subset):
         # Rename the set to match the new layer name
         set_layer_name = node.split(":")[-1]
         new_set_name = node.replace(set_layer_name, layer_name)
-        cmds.rename(node, new_set_name)
+        renamed_node = cmds.rename(node, new_set_name)
 
-        return node
+        return renamed_node
 
     def _create_layer_instance_node(self, layer):
         # We only collect if a CreateRender instance exists

From dbd75c67c72432223736208fb97a9eb05718b3f6 Mon Sep 17 00:00:00 2001
From: ccaillot <cyprien.caillot@gmail.com>
Date: Wed, 22 May 2024 16:52:23 +0200
Subject: [PATCH 10/19] Add post_placeholder_process when no representation

---
 openpype/hosts/maya/api/workfile_template_builder.py    | 3 ++-
 openpype/pipeline/workfile/workfile_template_builder.py | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/api/workfile_template_builder.py b/openpype/hosts/maya/api/workfile_template_builder.py
index a59ede5828e..c41560dc0ac 100644
--- a/openpype/hosts/maya/api/workfile_template_builder.py
+++ b/openpype/hosts/maya/api/workfile_template_builder.py
@@ -475,7 +475,8 @@ def post_placeholder_process(self, placeholder, failed):
         """
         node = placeholder.scene_identifier
 
-        cmds.sets(node, addElement=PLACEHOLDER_SET)
+        if cmds.objExists(PLACEHOLDER_SET):
+            cmds.sets(node, addElement=PLACEHOLDER_SET)
         cmds.hide(node)
         cmds.setAttr(node + ".hiddenInOutliner", True)
         update_instances_frame_range()
diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py
index eba36418cdd..3e4247eccd0 100644
--- a/openpype/pipeline/workfile/workfile_template_builder.py
+++ b/openpype/pipeline/workfile/workfile_template_builder.py
@@ -1609,6 +1609,9 @@ def populate_load_placeholder(self, placeholder, ignore_repre_ids=None):
             self.log.info((
                 "There's no representation for this placeholder: {}"
             ).format(placeholder.scene_identifier))
+            self.post_placeholder_process(placeholder, failed=True)
+            if not placeholder.data.get("keep_placeholder", True):
+                self.delete_placeholder(placeholder)
             return
 
         repre_load_contexts = get_contexts_for_repre_docs(

From de918043793fa8008ba63cc97b45bc97bf184cf5 Mon Sep 17 00:00:00 2001
From: BenSouchet <contact@bensouchet.dev>
Date: Thu, 23 May 2024 15:07:56 +0200
Subject: [PATCH 11/19] Bump version to 3.16.9-quad-1.13.0

---
 openpype/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/version.py b/openpype/version.py
index fb4e15cf467..fceea89bbfc 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
 
-__version__ = "3.16.9-quad-1.12.0"
+__version__ = "3.16.9-quad-1.13.0"

From 1c984dc5b80aa001ffbcdde7418d980b634d7b31 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Tue, 4 Jun 2024 17:12:49 +0200
Subject: [PATCH 12/19] #419: enhancement: aftereffects: deport custom
 resolution set to dedicated button

---
 openpype/hosts/aftereffects/api/extension.zxp | Bin 104030 -> 104050 bytes
 .../aftereffects/api/extension/index.html     |  12 +++++++++
 .../hosts/aftereffects/api/launch_logic.py    |  17 +++++++++++-
 openpype/hosts/aftereffects/api/lib.py        |  25 +++++++++++-------
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/extension.zxp b/openpype/hosts/aftereffects/api/extension.zxp
index 3ead44ef694f29e90e499a8b65197e59691de4d2..a95b1050f70bc9a2789ea44f6f34ef4599676c1a 100644
GIT binary patch
delta 7683
zcmaJ`1yq!6)7~W|mJR{wE|G>skPwjW5~NeQLBOSvZk7<FbLo-}L8PTYQb1}+>Hfv{
z`(EGI|M;Cf&$*vHGxv4RJ#)^?Jl8D1P`<-ZVmOc}TpP^dsqtwLF5BZB?Kv^`2Hu<H
zf(*>P>bT7-6BK|*Hc{Ey@!x=yNb7U8q5sunL*T}_)5!aerm`F&5_CTjct1V_f$BF*
z-h2PWtHwk;1^roSiCYW&v(z771cbD8XG|9r)$hiTSk(X97y<wQa1S7_+!e1)&HfuG
zCnk2EzWLuqZBdIM{&h<Zdg|YSG5>kX_<DM=-?091xfcv4xPO+C$qnMhQwU(j$I8<G
zFRiQpf#LmP@PA0l?E7%pKe%>j_q;Y-o<RfvbV&gKbbtfE%Ffix<DsRCt&Q4KT|n*+
z&-`%BZ*hl2VH*7Hk{ult`&mAm*OV2v?ZxmdK<ug;hlDZNrz(Q`6$oOZM$sq=8EhXD
z3S$`=^*`T=gjGH0jV0^}rQDjpPI76!6!}g|O`#OPug9rpDrzjhy3s?4Qo^dNuZJ%x
zt1Vv(eDF$8>ZUxSc9w{Flw^b|B%>n;34)K9DQyfI`E2qru#hXC>Egk_z{2I*EuEM*
zJQb1p0>wCQmLxbdQOYq0$}uWy%9h#vt7D7-64+m{K4cH_;qqsgaH)7Z%0JDuLRf9B
zz;|L5_{g{_(RRCAQ`1G2&&el`pC`D1KRUddloYsC^bAhKi%Krz>LqU6A(%UKRSP*w
zTYbYqf9lFI`-n+e8GcdtA?^J_{3X5PZGvfnbF5<ctQ53O6OrK*eu6@eUQ-`X(VP@;
z|9-w?aF-?Dk)1qKcUK_)?P@0RO;0AJw~LyaiAJsR(1g*1MEaHDH5s^ol~MKbdOZAl
zLYA`CUSVp;s}kwO1s37(z;uJQ@edFobOxGl!qGAv<_nxwG%yn!Cs$93M=WN0*E)fj
z9NG8ory2$cO|nRPKnM&mH;bR-_ArkoDb5smFVP8qe!i($zbs8}sdw?Vj!KwMgsT+O
zYf^{hrPhfXjXkp?+W8BE0{bMT+(!o`=*?YMWff}EkDiI;IzLmHsUNpSpAQs)*tGC7
zzj%pR*uj)Syfd8W5&zzGz{0XAv6$@G=98w^boDDX{=zsP%lA><8?ue7w*4?evTNC9
z39Uh_>tnj=j{%e6R+;x+GcX5e_mY3l0ewkqUm@KWgC|>fKLIDT-;$9tHpI-8D?TjG
z%|ayC$}|b=>a&u({us2KRL#IL2QkZ(G*%P3*w!*BsBm54WT9^x%rRGC)7JFaE-ev$
zBooP8!cC0V5)%5=cz26WKF_k}`m<_nnL;!-Nc>c(KWu0g!SMR?6H>NtYTh-aq?PAa
z7z-PFeM0yA#k3^@T|(!ibQrDQdN-xq)RZ;F@<c=C*`RrQc27$SGVNN2c_4Xe)3I1w
z#YK5r?#@?l73JL;@jF)VrTHg#sT!UKZA&#!D?n1u=8#*H+hXTL1}}OExymiULGx!6
zqn&nD)ok$?P7L&wHB6&Lp1rB(6$QN2oc8cFA$Ox(qB_LWk9q}ZmmI_=;=7YqnQ5o>
zG=b{&%6L{y9wh`z^lF#=8Ib%sv-(~0#zN#6j_!w7<Kbnm%1$~zj*%_emq!}NHUh4N
z<iBrPbZ2Q2Gqx^jsJHQgP2h<~kqfE{^aEmbiHmTt!NNoMlkH#_ZPWWk>l2Lx1!X*@
zQ{)zfMZ7O3yqV9)!vc*~o!)%M7=_$rYxKJ`0JzJiKVRZ!gGheQeWbr9)xY-qEC^P?
zw7;wWJ5?SAKlyW-gNCRu{#mL}uIuziX+4MrNK5o*aiRba3;ECDdm_L^j6aLzWr0NK
zh(F2()Jz@7@SEPh>qh;)IuHf@H<e%IpkCJi_!$ZDhl8OHO@aTfVA1~W+rJBzc0RXd
zg#-lvPz@b01=9U?z%Lu<GX%`*HOzqI_>gPi^6Yqro)|I8?7)H<vr5JLxx_E3EpZIH
zbrVjH-Z{=aNU7WzjMW60b)crdk5KfoHS3|A9-9sJOUMAy8tIT?0Bn@4=(yv8=-i%{
zM8KG8`YBx4N*}T$GdtDCBoqfWlB0Np2jX`jT${T;a94H-Bk)<6)-HRa6$%@LT|t!B
zsq8l<13*UGv|#zKim40=v|{(U&@;)>6kR0!GFefkcd-c)MT-Hns{Te^qZeX@PP7`Q
z(Z%U8aNq3**K?ym9vgzV<4{H4+{7qSfSRfm-`D=g*7go>X}GmU0WF^}Sii@Ti*<IG
zxqJe#FIW>CP2*K@AzCl(Cp*3y56R&2k+qVU>6YbD-#knj#gv$FIDRVBzLSmeV&;e+
ze0IPe*@$DVg`=?uJ*gwvH2D<kvcuqZ)#$7t9~XcrU;bs)vZOVtd+n(r;i4a|ZDT*L
z-5hgQY$r|Qc`I}&DfZl<BYlOk{7a&*+ebMeYa+P+aBQ)LTm@`i8=i?015xuu-q|UX
z)#WiWmBNE9d1{sga+V=7qEEKNk4yOrAk7XThtEKri;J(YUPdopKg_orbFiVJ|Eef`
z1ap?U#jpuf?%j0nJz8m&`Z6o1g_6o5CW%YUpdc8V&Nq>nLFy|`<ZGO-3*R;pEKZXi
zGdrH*{;<F!jNW2oo+>Zp05Qh^jk62V-hXbYhA62|mm4MN@<66${UsHP(FgC<E%8v2
zHPqB}o6OGycCBc1@5u*q(-rh#`zNs^L#7*I6`^JJ=AGYdJ@eF+d>&qT_UDLO&#obW
z7{AGU8r6GgX)q(fVdzGn8FwsHy-T#rLbnMP+k2In>?HlhC&}A0tR4b5+J4QtM(@mB
ziuy{-_kFrGI>PP_c@*OT?-(yu&DWjfx(w4mGS>aaLiO&KZoI2YJ~~x-Lyb83fhJu?
zc{~aABe)0HDEu-EAZ7xCnA5GS1Z-^@yB<Y<M}aa?jHM&YWW?b8G*T3MMoVa$G?UE!
zZXT2VSSwulUR7@FOBo1>fWCdj7je$yr9mclZHV{R7PmlvVmlMs+>4%MdB;wQ<0CTG
zbL&t8J~_bN_<J&7G3mGu@0U?d<qc-;x>@UC?;qLxcH5S1{zdwy`G$A|1L4{CEwiO1
z*`Htw1Us21EM?SB)Mx02-I2ju!af;M)7ADLZ}SnL;kk+hW_=KyK8s!!djzq*-NzaN
zW%fz0B}-`mmq{@0XAFbyji8BMUz-%XY?mwRLVLb&ZM4}ix)?|^^+>mwzK$^pRK~~?
zgk`h8JzAfuP;nlRx-niG5<+0~2a6bv@UXNfUMwWkOjXW!_(kLS4b^3%FBCr<OyiS?
zfDv+*GDih$f@2}}y^?DvGy^Mb7X`=J(CvP0j;t8*9$7KZgV@8c-WrzVU<7<j+qn*#
zh7nWhiRqDHO=J6}ui*Z*Gb#S?ZII;dq=!_*oGp)%16aBsm7lR@96u$%MkmCNZ>aC>
zcPj)~(QeB6R=#I2e>gGd)46k$&I562F);Nz!<{$_`3;Civ~Hy-s&`!-4@FWNn!<y}
zj}9h_=N%PB6bqj<ZM!#Ru|HL8xW}cu%ApCZaf4^@et7(HZY#a}Vs^%94M}odn4c5d
z&S*^VtQeHpgj%-ttg@B;*)yMp(6QOgaFu%-x2Wjy@kP|uCXMJLNO&rG?jHk!1W-g@
zE8`ltu}9lM=2TongK*)J@ya_kY9KbfT0dv8Ui+RTTZeZhHr8>+q;pQK^?Z#76P(RW
zmPa!S<32D<|IBM2X8|7h=e83;Yi+$Xhh&g^$Mvt9O@{bZBl5E9!)L*CdN2^N#bwRq
zH{x2{Jv(}oTqMbw0HREYg79-kZGz7Xnz5xsR!sE}CVx)GnLeHlxhY-5d#%%kgB6Cn
z5o!MB47sIfa^gd)G!flf>T%4kxwx=*s^Gx=n$rLPiXt@I-6-B}bXMY|xC>_);bh#~
zXg5Wjzrv6vw80w*F-YfY;LPm22kmC!3qp76f&*PG&u+AZkH#s5s@Nr}OjhuWp_U*^
zZi4|xC<7+1aX~w$$X1y77xVL;3UQo-5|`Sw8W_$a0Ql6ub{sv8dQxDDf;myaNNgi3
zM<Zr}uP#B2v3VC>Bf^=zvR0ZPN*v5*bGo)9bPp>*_AEtDZtoEf+vDwi4Ik>NnV3;L
zN$yu(7V$$X)x*A@1JsNWg*nWSwnU)~r=MaWT1h%wTj~!Q>M`xG$6Y-GtZDOXHclp@
zE-L5kRt{9i!r*gQIS9!M)ZuDGa0<Q|y^8v!C3@AJ<cQj3KkBoaZx0Sxls2U((LU&=
zklFQiJK?DA_tUXPZ3IqQg?{QS_`EN+%}Z{vT-f{F+p?Vv?*LIBcgcVT#4<c&S}QsY
zDd^Act7eG$s4b_g`E?OlC1#wE<~{bp!TF6DA@(wz?z@L2$D7@+QVHQ!*O)gCCpT;K
z3%b42%?sc)je3W&Fi&CK!~R#Gt4jUcV{ls1zI)@4dG)bQ_klgu?Z8yODhvw9U8;6P
zOD`V#*64paQRCOv@0!?oX%hz72S@=SONq~>2m$5sBv&tB@N?#y1J`uMebig6>e^%r
zYak$vN0<N5bRNI}!h&Qlz@0~69Jj7@t<4uH*ayVxT*`&p9nQ+*nR`C#G9}us=dTJ3
ziA^fLYa3?Q7Q1t0SA{ZKX<D0z2HU0Eo!FDrmQDzr>aSc{h%7L|Ro;<pW{yJ+6>n1A
zyR3WGKHF~%Ml@Tnl)5=1hDNxV+kO(lpzF7@$w!a>P{6Q@NbEtKj_fLvH;Z?mMT}ro
zu*_gy$$Z+rTT;$(FK=CN$JD!;dvS>8?Nc?kS^2Tgc!~W5{D-qIRFx7pB&@)Sf)u!2
z0-vU@{0YcX!_l*EulH_4rP#tC!33e53VHT1M3}=gRdhXXO`EHOoxUEN_Oyb`af@+n
zE*G+3b5+UUIznbB-^TQ;qW*>!RcG3Ahs7$C?Boz4(<v=6Jk{9XyY)C)lQ7sSs2NpN
zU}_+cNG())oiCN<I4jwjQE#T$&f;vGT>N!)$nBQgGlK{63lz=o9_-veDxS<-uI$cg
zT}q!6LSFc-VNBj^YffN)Pvzns2enn@bL_)Kb13g$=?|>rC6m=`_V6Bv6?n$whkS|;
zKUoi#vJ>XKfEahVoEMulC?~D#ic|w)T7Y%wH&$3KQH>VZuS1yiot{2Pj41-x1lAJ*
zT3(h&i5ifaw6hg8R<VpgV1pZOptFKzLrIjn2<I!mD8i)R0Zq|yI~M8NL3Vx(JTI*`
zsPfWWa`rTi5OwA=Ct^BNvHATb<(kr0)xHNkb!TZbC#>0~iVrC&)OWm@RM!mrxN7uh
ztcPt`P}G6NQ&sXDbyCU6E|1e6eygNHCjQ1N0hZI!uMf}{L|J8n7``x{Q}RVW3CzE!
zpW86%ODbvZWoh2xiEkC&uYYZxIlUItoX*P8UkrM_#BQWXb_%VUD~YqjV#SN2?%J8B
zogJ!dG<cO;)ND@l7+G7uBgD%X%nm0=>IP&cd@xQLbd?0-$ZLV;wos!H!fA&=^X7i#
zyN>ps*x@I;4wQ<J+cN30D$Shvz0=F0vety)cBSo@7Sf1<BV=`i)G_7M-eU6V4&v|9
zG!6)MrJg<NO}1v9UQE=^zAZ>AzIhupD2t;vFt#JWJ6o=XCXZll{^R~5lAPL>aQ8VG
zn0RC*P8sZ3ch@2o`-{wSY`EaU{?-<1R^vs7Lqvs!`a-4*A?8Jn7YOgP=rsKu1)il_
zcu9N9zJ_S1vQ(Z$j*Btp8kDN&xVBlP263`c*xHzc)kn05x}ArdVD1+2*SC<STNkt-
z07(D)cMatoQ*=jk-K}@(f3@mbZe7~k+%1TGP^m!R|D%{7cN_k@X(Cz2KBo__XOZ@s
zPy|=BCIa8mx0mL*C^ndUX*v;}CRT{%1s%RmuIYPw<?+bL$%o0G%n^q_9Ghr^sA#wx
zf+WS(#ubo9qA#25zszpPK^aIcZg3`D4=6FMXHSagGrqI5GYCYPoFS0e?T7RlP`2*h
zKu%G+4~!XopR7M=_6!htM}D}DyJG4|<f(}F;w`w38+X!Z7Xp-t(NZDLhtwyxdg<Fo
z>?94WR4nE2GgS9jU?@fup>897Z#y_8X%!!$MNdB{DItH{iEd7Dm3@kQ#eXQt7#@W)
zfo%{$etZ2DZeV2i9Tuz;sh^#xr5GIL2}#Vx&bieQI2qw2Lq`16hS_=lL$3vHz;t=Q
z4H~b{@%dJlOB~7#Rk0Zr%QTpro_j%lY)#&+A!Bx@$U2@Gzc1%CK2Btm&G9Aw_Vs|p
z`*)SzBt8Ry@1nQAowN<UgF+}?SCB0n*a(C7)k)(%!#sN_roJ>|fJ-J38`U_hq#$%o
zU|o9`2_i38Q^mPB9m0%WM$7WeP**f}n{A}}hM%b>C%E26C2-7^&)^-E@mdkWzOb-S
z&6vI$fwviK9fztt2)8bWacjwl&g3dIi?@xPn9rWzqL~W!Q@)CUb!0v6KxxD1$fQ%o
z%DzfRrrYNxzw0!Y@J?cwnvnezCIq&%A)qb^g1mXGH0&A-G#`4z;;e`<Mpk_>BMc11
zTIPzNwHsOHQ653BFr+RnG#f{>E@r8>LEgO?5@4^Vc_a9UFA38!<wd7E46DwCDuw5h
z<f|4^%9EG%kAcS%3}FKcbUs5i%`#4{ZDf=FB}9AlL=lond%0uZX{uN)Dj+ZD$Z?j@
zu4+Qr7C4EinqPr8sOoAjo7~kOV<6cX#y$1bPw{u#)G@cLmQ%>>2nW@a8tPKp?G=Sr
z8}J06W(b7=*6)|D@+{D6y9!$J0jLDgDlo~5$iT`eq>E|^>;~p1-5+d;k-omvF@Bah
zx7ZEVGfQEfDtP^19F}6n69MUR6%ltHGLdc!JZ4p4A|7-xwPVPzmbfw|Tvrvbb71To
zxt>=wUWGk%{J@w~W>Sp%@VwK*FNaUa^*#Qi=nh?&1*^~(`Rrb!4wzZn_Ec1{X_k@9
zsk>0#)*1n@(Ys6yQ`&V02aE9YyF|{N@G5H3qiL?m?Q^P~hHKM(her?#brKFT*`oFg
z(%MJDsni;ohjp{5HCzSe{+iqD+=P>P@s;E+a#ey7c4Ub)%H=OEg~T!jA6ElNS>-TX
zQ*?OJ37gE}Wd3Q>`Yr+v&iS?$!d9$Ec_S9sH7#wK$IW|Gp2mB7su32I;l&jN893r2
zw4hP5xHrkNMrV4{@0=lLgC|KV(@k^GdHkcT^^*F!^VXv$M*{}wXL;rMD(LVm`X^Us
zh_<^D@y-V+Z+S74l->_|7`zR5MbFsdk;`~S>KWNJr8ZPXtqMCYU^s2<_F41!o;8ca
zpJ|3YX_+#9IRy4pS%LD-_3c<HQBpG=#P(BFmTPe9CVeEVp%8~8r%9v1!c0Aal|Gye
z=L~y=eQ>AMa3FW8G{Ny43e^E?=!iO8B6cHTG1{muFuNYex~QL`J+058(4iBWd(>u$
zfL|RkY@X4?FL(QRHo8|PFa&vak7f}|;JfS=n4@{Fh|=fH^4E(I_u@0=$g0_mdkBsT
zr%Vg{@uB#a7YkF6;_)<|taeJwTJDGsbtGT_33@-P%cImhqfLX_D;~g==f2z<_BT#+
zW&wlx*<Adk;TV`9c?2dUj`(;uc*-1#SxZ{J()t<H+via7&W9jfCPq(|Dl&DO-7?**
zI1841zuFQdIQ52f>V6+Hxe4!={h8%ly}Cq^28Mmgb9YZj+^U84yp$hC&3MX#ZkaXG
zC<lsY0OxG_m5K{<T<K^-*xDxv6pziV)J~rQD)Fc^(c9bjo1}(nlEKvt2dwDJn9`b3
z!i|~GG7FXVDrZY})=I@_>b+wX!ds$C+e34))ncn^;39I!2tmIMl3MxhV@4vf&^lY6
zotOT;{Ai(&vaDh6Y2lz__E(Yl51wAqcy2mL?ww?~^%gn1P5%J@OgF#%O6Fa3aqd*u
zFlq*bMueIzR4<T|^ofl_an4Fd!5HZI6+-#(IO5wGaTXnESyek$uSQW%bXi0C*0<V@
z5{dB>4{t#iYBTM{khhP&D#b&m#@XpMPBQwZG|3VmHC!mHs?|-rO7;(f4Z`&zLL$%u
zEbFzO9`mBzsv-2*2Pj+=;qtI_T&`(1Mz{!xcpNpWMLi|)s50q4H1W1+NNK;pa*IPn
zd;DS5Tm@QbnTX4S%b@_vCFq_TcCDTc@>~R`rO?HG>>alB?0DW5FTh@mzQ-_!nk>1H
zkQ{>yu~zFIMH*F{QO_(JA|_kKRX}AG=Q7a|ooasm#A%Ub%@O^X-Xn)mG-pSl6kAQ9
z6@qsCop?~oazK&Pq{T?I^F^vjPkRQKpC-ROq4b_KGiJYQWJ9%P9jOxX?AqK|Uhl;8
z+3N1YQEDB7YJ7?}aGZPx0URvp_AQ3h7|q%hh#eEP|LS}-<2k{k4i-DLbZWcPbeh>W
z*+MP86n(7>a-y|DDSbl1W5B|-rxWM<M@Q!mpuQg?tOU~SkTxRLv*9{)ChlZbb~=uU
z<I6Xc{B6^-j+fs=Z{P$saNUXijd|$OEyBN=2W_;QW)bEeZ0g+uZHWL9|IXcE+;tHD
zd7uK3Krh4}Tq<-S0Z0ZNi3AcN-OZZnw<3Y)z@LLI=vfr-5&j)fs4NFWpaA?$5kiHc
zfx-lLL#)39zj#?_L^P1|FPx5OU;_~A-}4~on^++0&r#1mH~vim|73yz07L-pf8KC@
ztcyVaz)NQiwWmlwM@Jg!$N<z|HvKyKKU;n-_x^?86#Nsx#>)674Aw84y9+}_<A5xP
z=plf3oDdRda2!w&*aU5l1L^=nprr9Y1w>Q<AQU73B)yYSLOq0mSfIb`0|KaioaP5@
zjRz_MJD{KhAP?ma>Q*}}ZehJ24FHG~xto9eQ`a79m;fY2y7L_LbpntDI0`LF0CN3g
zY45`DRKOJY<FX!qy6xW)_(jsb1_1E>b;bZxI1xz0@q2WBbeDfI?f>x;+P_>>4vk6#
zl92q>Vg8EsuO72K5lD#mED#7)4g``?{38^1J?1}ydDq3_Bmv2Q^-#7X;C<4+Adyk-
SjwS!`Te}AUxJ3eg{QEzxtJU`a

delta 7671
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
N(Lo@~?<_C~^gq4})LsAp

diff --git a/openpype/hosts/aftereffects/api/extension/index.html b/openpype/hosts/aftereffects/api/extension/index.html
index 480b814a57a..8ae13342b45 100644
--- a/openpype/hosts/aftereffects/api/extension/index.html
+++ b/openpype/hosts/aftereffects/api/extension/index.html
@@ -82,6 +82,17 @@
       });
     </script>
 
+    <script type=text/javascript>
+      $(function() {
+        $("a#setcustomresolution-button").bind("click", function() {
+          RPC.call('AfterEffects.setcustomresolution_route').then(function (data) {
+          }, function (error) {
+              alert(error);
+          });
+        });
+      });
+    </script>
+
     <script type=text/javascript>
       $(function() {
         $("a#setframes-button").bind("click", function() {
@@ -162,6 +173,7 @@
             <div><a href=# id=sceneinventory-button><button class="hostFontSize">Manage...</button></a></div>
             <div><a href=# id=separator0><button class="hostFontSize">&nbsp;</button></a></div>
             <div><a href=# id=setresolution-button><button class="hostFontSize">Set Resolution</button></a></div>
+            <div><a href=# id=setcustomresolution-button><button class="hostFontSize">Set Custom Resolution</button></a></div>
             <div><a href=# id=setframes-button><button class="hostFontSize">Set Frame Range</button></a></div>
             <div><a href=# id=setall-button><button class="hostFontSize">Apply All Settings</button></a></div>
             <div><a href=# id=separator1><button class="hostFontSize">&nbsp;</button></a></div>
diff --git a/openpype/hosts/aftereffects/api/launch_logic.py b/openpype/hosts/aftereffects/api/launch_logic.py
index e90c3dc5b80..7dd9bfcf1f0 100644
--- a/openpype/hosts/aftereffects/api/launch_logic.py
+++ b/openpype/hosts/aftereffects/api/launch_logic.py
@@ -23,7 +23,7 @@
 from openpype.tools.adobe_webserver.app import WebServerTool
 
 from .ws_stub import get_stub
-from .lib import set_settings
+from .lib import set_settings, set_custom_settings
 
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
@@ -328,6 +328,9 @@ async def sceneinventory_route(self):
     async def setresolution_route(self):
         self._settings_route(False, True)
 
+    async def setcustomresolution_route(self):
+        self._custom_settings_route(False, True, True)
+
     async def setframes_route(self):
         self._settings_route(True, False)
 
@@ -358,6 +361,18 @@ def _settings_route(self, frames, resolution):
         # Required return statement.
         return "nothing"
 
+    def _custom_settings_route(self, frames, resolution, use_custom_settings):
+        partial_method = functools.partial(set_settings,
+                                           frames,
+                                           resolution,
+                                           use_custom_settings=use_custom_settings)
+
+        ProcessLauncher.execute_in_main_thread(partial_method)
+
+        # Required return statement.
+        return "nothing"
+
+
     def create_placeholder_route(self):
         from openpype.hosts.aftereffects.api.workfile_template_builder import \
             create_placeholder
diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index d4843109bf3..21a28a8a5c0 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -149,7 +149,7 @@ def _get_override_group(resolution_overrides, application_regex):
     return None, None
 
 
-def set_settings(frames, resolution, comp_ids=None, print_msg=True):
+def set_settings(frames, resolution, comp_ids=None, print_msg=True, use_custom_settings=False):
     """Sets number of frames and resolution to selected comps.
 
     Args:
@@ -165,7 +165,6 @@ def set_settings(frames, resolution, comp_ids=None, print_msg=True):
     asset_doc = get_asset_by_name(current_context["project_name"],
                                   current_context["asset_name"])
     settings = get_asset_settings(asset_doc)
-    custom_settings = get_custom_settings(current_context["project_name"])
 
     msg = ''
     if frames:
@@ -176,14 +175,11 @@ def set_settings(frames, resolution, comp_ids=None, print_msg=True):
                f"fps:{fps}"
 
     if resolution:
-
-        workfile_overrides = get_workfile_overrides(custom_settings)
-        if workfile_overrides:
-            override_width = workfile_overrides.get('working_resolution_width')
-            if override_width: settings["resolutionWidth"] = override_width
-            override_height = workfile_overrides.get('working_resolution_height')
-            if override_height: settings["resolutionHeight"] = override_height
-
+        if use_custom_settings:
+            retrieve_custom_settings(
+                project_name=current_context["project_name"],
+                settings=settings
+            )
         width = settings["resolutionWidth"]
         height = settings["resolutionHeight"]
         msg += f"width:{width} and height:{height}"
@@ -203,3 +199,12 @@ def set_settings(frames, resolution, comp_ids=None, print_msg=True):
                                  fps, width, height)
         if print_msg:
             stub.print_msg(msg)
+
+def retrieve_custom_settings(project_name, settings):
+    custom_settings = get_custom_settings(project_name)
+    workfile_overrides = get_workfile_overrides(custom_settings)
+    if workfile_overrides:
+        override_width = workfile_overrides.get('working_resolution_width')
+        if override_width: settings["resolutionWidth"] = override_width
+        override_height = workfile_overrides.get('working_resolution_height')
+        if override_height: settings["resolutionHeight"] = override_height

From 67d66839aaad3d14e6048926125a3b88c1844ad7 Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Tue, 4 Jun 2024 19:28:34 +0200
Subject: [PATCH 13/19] #419: enhancement: use hosts instead of applications to
 avoid handling softwares versions

---
 .../hosts/aftereffects/api/launch_logic.py    |  2 +-
 openpype/hosts/aftereffects/api/lib.py        | 21 ++++++++--------
 openpype/hosts/nuke/api/lib.py                | 25 ++++++-------------
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/launch_logic.py b/openpype/hosts/aftereffects/api/launch_logic.py
index 7dd9bfcf1f0..ad4c9e76f9f 100644
--- a/openpype/hosts/aftereffects/api/launch_logic.py
+++ b/openpype/hosts/aftereffects/api/launch_logic.py
@@ -23,7 +23,7 @@
 from openpype.tools.adobe_webserver.app import WebServerTool
 
 from .ws_stub import get_stub
-from .lib import set_settings, set_custom_settings
+from .lib import set_settings, retrieve_custom_settings
 
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index 21a28a8a5c0..475646251f6 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -6,6 +6,7 @@
 
 from openpype.pipeline.context_tools import get_current_context, get_project_settings
 from openpype.client import get_asset_by_name
+from openpype.pipeline import get_current_host_name
 from .ws_stub import get_stub
 
 log = logging.getLogger(__name__)
@@ -128,25 +129,22 @@ def get_workfile_overrides(custom_settings):
     if not resolution_overrides:
         log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
         return
-
-    app_year = f"20{get_stub().get_app_version().split('.')[0]}"
-    regex_str = f'(aftereffects)[\\\/\.\-\_\:]({app_year}$)'
-    application_regex = re.compile(regex_str)
-
-    overrides_group = _get_override_group(resolution_overrides, application_regex)
+    print('@@ OVERRIDE')
+    print(resolution_overrides)
+    current_host_name = get_current_host_name()
+    overrides_group = _get_override_group(resolution_overrides, current_host_name)
     if not overrides_group:
         log.warning("Can't find overrides group that fit application. Abort.")
 
     return overrides_group
 
 
-def _get_override_group(resolution_overrides, application_regex):
+def _get_override_group(resolution_overrides, current_host_name):
     for resolution_overrides_set in resolution_overrides:
-        for application in resolution_overrides_set.get('applications', []):
-            match = application_regex.search(application)
-            if match: return resolution_overrides_set
+        if current_host_name in resolution_overrides_set.get('hosts', []):
+            return resolution_overrides_set
 
-    return None, None
+    return None
 
 
 def set_settings(frames, resolution, comp_ids=None, print_msg=True, use_custom_settings=False):
@@ -203,6 +201,7 @@ def set_settings(frames, resolution, comp_ids=None, print_msg=True, use_custom_s
 def retrieve_custom_settings(project_name, settings):
     custom_settings = get_custom_settings(project_name)
     workfile_overrides = get_workfile_overrides(custom_settings)
+
     if workfile_overrides:
         override_width = workfile_overrides.get('working_resolution_width')
         if override_width: settings["resolutionWidth"] = override_width
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 3d19206b403..5877081201c 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2629,13 +2629,8 @@ def set_workfile_overrides(self, custom_settings):
             log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
             return
 
-        application_name = self._get_application_name()
-        major_version = nuke.NUKE_VERSION_MAJOR
-        minor_version = nuke.NUKE_VERSION_MINOR
-        regex_str = f'({application_name})[\\\/\.\-\_\:]({major_version})[\\\/\.\-\_\:]({minor_version})'
-        application_regex = re.compile(regex_str)
-
-        overrides_group, application_name = self._get_override_group(resolution_overrides, application_regex)
+        host_name = get_current_host_name()
+        overrides_group = self._get_override_group(resolution_overrides, host_name)
 
         if not overrides_group:
             log.warning("Can't find overrides group that fit application. Abort.")
@@ -2647,7 +2642,7 @@ def set_workfile_overrides(self, custom_settings):
             "pixel_aspect": asset_data.get(
                 'pixelAspect',
                 asset_data.get('pixel_aspect', 1)),
-            "name": f"{project_name}_{application_name}"
+            "name": f"{project_name}_{host_name}"
         }
 
         if any(x_ for x_ in format_data.values() if x_ is None):
@@ -2678,18 +2673,12 @@ def set_workfile_overrides(self, custom_settings):
         nuke.root()["format"].setValue(format_data["name"])
         log.info(f"Format is set with values : {format_data}")
 
-    def _get_application_name(self):
-        return  "nukex" if nuke.env['nukex'] \
-            else "studio" if nuke.env["studio"] \
-            else "nuke"
-
-    def _get_override_group(self, resolution_overrides, application_regex):
+    def _get_override_group(self, resolution_overrides, host_name):
         for resolution_overrides_set in resolution_overrides:
-            for application in resolution_overrides_set.get('applications', []):
-                match = application_regex.search(application)
-                if match: return resolution_overrides_set, match.group()
+            if host_name in resolution_overrides_set.get('hosts', []):
+                return resolution_overrides_set
 
-        return None, None
+        return None
 
     def set_favorites(self):
         from .utils import set_context_favorites

From d86ecaa1e8600e7e690882bd86faf581c820d149 Mon Sep 17 00:00:00 2001
From: hfarre <hadrien.farre@wizz.fr>
Date: Thu, 6 Jun 2024 15:04:14 +0200
Subject: [PATCH 14/19] =?UTF-8?q?bugfix:=20382:=20Fix=20le=20pbl=20de=20cl?=
 =?UTF-8?q?=C3=A9=20manquante=20lors=20du=20clean=20de=20frame=5Freference?=
 =?UTF-8?q?=20et=20la=20r=C3=A9cup=C3=A9ration=20de=20frame=20d'exposition?=
 =?UTF-8?q?=20au=20cas=20o=C3=B9=20le=20IN=20est=20situ=C3=A9=20entre=202?=
 =?UTF-8?q?=20frame=20d'exposition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openpype/hosts/tvpaint/lib.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/tvpaint/lib.py b/openpype/hosts/tvpaint/lib.py
index 97cf8d36339..eddbf6de9aa 100644
--- a/openpype/hosts/tvpaint/lib.py
+++ b/openpype/hosts/tvpaint/lib.py
@@ -179,6 +179,9 @@ def _calculate_in_range_frames(
     # Calculate in range frames
     in_range_frames = []
     for frame_idx in exposure_frames:
+        # if the range_start is in between 2 exposure frame
+        if range_start > frame_idx:
+            output_idx_by_frame_idx[range_start] = frame_idx
         if range_start <= frame_idx <= range_end:
             output_idx_by_frame_idx[frame_idx] = frame_idx
             in_range_frames.append(frame_idx)
@@ -257,7 +260,10 @@ def _cleanup_frame_references(output_idx_by_frame_idx):
         real_reference_idx = reference_idx
         _tmp_reference_idx = reference_idx
         while True:
-            _temp = output_idx_by_frame_idx[_tmp_reference_idx]
+            #to avoid not finding key (outside the range) we make a get
+            _temp = output_idx_by_frame_idx.get(_tmp_reference_idx)
+            if not _temp:
+                break
             if _temp == _tmp_reference_idx:
                 real_reference_idx = _tmp_reference_idx
                 break

From 8677c1dbf51d0c1051ef3cd8c0926e08790c7b9c Mon Sep 17 00:00:00 2001
From: Guilhem Compain <gcompain@wizz.vfx.int>
Date: Wed, 12 Jun 2024 10:06:19 +0200
Subject: [PATCH 15/19] #419: enhancement: also apply custom resolution at
 render subset creation

---
 .../hosts/aftereffects/plugins/create/create_render.py    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index fbe600ae68b..6edaa2d935c 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -95,7 +95,13 @@ def create(self, subset_name_from_ui, data, pre_create_data):
             self._add_instance_to_context(new_instance)
 
             stub.rename_item(comp.id, subset_name)
-            set_settings(True, True, [comp.id], print_msg=False)
+            set_settings(
+                frames=True,
+                resolution=True,
+                comp_ids=[comp.id],
+                print_msg=False,
+                use_custom_settings=True
+            )
 
     def get_pre_create_attr_defs(self):
         output = [

From 15ee4ca4f59eb30b4f625df052e692673693e733 Mon Sep 17 00:00:00 2001
From: BenSouchet <contact@bensouchet.dev>
Date: Fri, 5 Jul 2024 16:01:49 +0200
Subject: [PATCH 16/19] Avoid crash if deadline module is disabled

---
 openpype/settings/entities/enum_entity.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/entities/enum_entity.py b/openpype/settings/entities/enum_entity.py
index 2336db7481b..aa873e56f36 100644
--- a/openpype/settings/entities/enum_entity.py
+++ b/openpype/settings/entities/enum_entity.py
@@ -566,6 +566,9 @@ def _get_enum_values(self):
 
         modules_system_settings = get_system_settings()["modules"]
         deadline_enabled = modules_system_settings["deadline"]["enabled"]
+        if not deadline_enabled:
+            return [], set()
+
         deadline_url = modules_system_settings["deadline"]["deadline_urls"].get("default", "")  # noqa
 
         try:
@@ -654,7 +657,7 @@ def _get_enum_values(self):
         modules_system_settings = get_system_settings()["modules"]
         deadline_enabled = modules_system_settings["deadline"]["enabled"]
         if not deadline_enabled:
-            return
+            return [], set()
 
         deadline_url = modules_system_settings["deadline"]["deadline_urls"].get("default", "")  # noqa
         manager = _get_modules_manager()

From 2743a4511baaa43125ff8761eb12669cf435bec7 Mon Sep 17 00:00:00 2001
From: BenSouchet <contact@bensouchet.dev>
Date: Mon, 8 Jul 2024 11:42:08 +0200
Subject: [PATCH 17/19] Fix errors (quadproduction/issues#419)

---
 openpype/hosts/aftereffects/api/lib.py                    | 6 +++---
 .../hosts/aftereffects/plugins/publish/collect_render.py  | 8 ++++----
 openpype/hosts/nuke/api/lib.py                            | 2 +-
 openpype/hosts/nuke/api/pipeline.py                       | 2 --
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index 475646251f6..14709bfb695 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -124,13 +124,13 @@ def get_custom_settings(project_name):
 
     return custom_settings
 
+
 def get_workfile_overrides(custom_settings):
-    resolution_overrides = custom_settings.get("general", []).get("working_resolution_overrides", None)
+    resolution_overrides = custom_settings.get("general", {}).get("working_resolution_overrides", None)
     if not resolution_overrides:
         log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
         return
-    print('@@ OVERRIDE')
-    print(resolution_overrides)
+
     current_host_name = get_current_host_name()
     overrides_group = _get_override_group(resolution_overrides, current_host_name)
     if not overrides_group:
diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
index 3b0f00a786a..06bec0dcf0c 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
@@ -26,7 +26,6 @@ class AERenderInstance(RenderInstance):
 
 
 class CollectAERender(publish.AbstractCollectRender):
-
     order = pyblish.api.CollectorOrder + 0.405
     label = "Collect After Effects Render Layers"
     hosts = ["aftereffects"]
@@ -53,9 +52,9 @@ def get_instances(self, context):
         version = context.data["version"]
 
         project_entity = context.data["projectEntity"]
-        project_settings = get_project_settings(project_entity['name'])
+        project_settings = get_project_settings(project_entity["name"])
         try:
-            format_conversion_table = project_settings['fix_custom_settings']['aftereffects']['publish']['CollectAERender']['format_conversion']
+            format_conversion_table = project_settings["fix_custom_settings"]["hosts"]["aftereffects"]["publish"]["CollectAERender"]["format_conversion"]
         except KeyError:
             self.log.warning("Can't retrieve format conversion table from after effects custom plugins.")
             format_conversion_table = None
@@ -167,7 +166,8 @@ def _convert_format_label(self, retrieved_format, format_conversion_table):
             return retrieved_format
 
         return {
-            single_format['format'].lower(): single_format['converted_label'] for single_format in format_conversion_table
+            single_format['format'].lower(): single_format['converted_label'] for single_format in
+            format_conversion_table
         }.get(retrieved_format.lower(), retrieved_format.lower())
 
     def get_expected_files(self, render_instance):
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 5877081201c..d98d772c3f7 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2624,7 +2624,7 @@ def get_custom_settings(self):
 
     def set_workfile_overrides(self, custom_settings):
         project_name = get_current_project_name()
-        resolution_overrides = custom_settings.get("general", []).get("working_resolution_overrides", None)
+        resolution_overrides = custom_settings.get("general", {}).get("working_resolution_overrides", None)
         if not resolution_overrides:
             log.warning("Can't retrieve resolution overrides for workfiles. Will not be applied.")
             return
diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 9d24c931be8..421fce3d97c 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -193,8 +193,6 @@ def add_nuke_callbacks():
 
     log.info("Added Nuke callbacks ...")
 
-def test():
-    nuke.message('test')
 
 def reload_config():
     """Attempt to reload pipeline at run-time.

From 625dafcee2508de150487156bb3ccf1fc58d1347 Mon Sep 17 00:00:00 2001
From: BenSouchet <contact@bensouchet.dev>
Date: Mon, 8 Jul 2024 13:11:38 +0200
Subject: [PATCH 18/19] 419: Update custom settings name

---
 openpype/hosts/aftereffects/api/lib.py                        | 2 +-
 openpype/hosts/aftereffects/plugins/publish/collect_render.py | 2 +-
 openpype/hosts/nuke/api/lib.py                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/lib.py b/openpype/hosts/aftereffects/api/lib.py
index 14709bfb695..860fcd8c13a 100644
--- a/openpype/hosts/aftereffects/api/lib.py
+++ b/openpype/hosts/aftereffects/api/lib.py
@@ -117,7 +117,7 @@ def get_asset_settings(asset_doc):
 
 def get_custom_settings(project_name):
     project_settings = get_project_settings(project_name)
-    custom_settings = project_settings.get('fix_custom_settings')
+    custom_settings = project_settings.get('quad_custom_settings')
     if not custom_settings:
         log.warning("Can't access to quad custom settings. Custom settings will not be applied.")
         return
diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
index 06bec0dcf0c..8889ed13ea5 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
@@ -54,7 +54,7 @@ def get_instances(self, context):
         project_entity = context.data["projectEntity"]
         project_settings = get_project_settings(project_entity["name"])
         try:
-            format_conversion_table = project_settings["fix_custom_settings"]["hosts"]["aftereffects"]["publish"]["CollectAERender"]["format_conversion"]
+            format_conversion_table = project_settings["quad_custom_settings"]["hosts"]["aftereffects"]["publish"]["CollectAERender"]["format_conversion"]
         except KeyError:
             self.log.warning("Can't retrieve format conversion table from after effects custom plugins.")
             format_conversion_table = None
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index d98d772c3f7..9b83619fee2 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2620,7 +2620,7 @@ def get_custom_settings(self):
         project_name = get_current_project_name()
         project_settings = get_project_settings(project_name)
 
-        return project_settings.get('fix_custom_settings')
+        return project_settings.get('quad_custom_settings')
 
     def set_workfile_overrides(self, custom_settings):
         project_name = get_current_project_name()

From ecd30d63d8ec4fe49f9d5418a8684862866ca947 Mon Sep 17 00:00:00 2001
From: BenSouchet <contact@bensouchet.dev>
Date: Mon, 8 Jul 2024 13:19:55 +0200
Subject: [PATCH 19/19] Fix comment (quadproduction/issues#382)

---
 openpype/hosts/tvpaint/lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/tvpaint/lib.py b/openpype/hosts/tvpaint/lib.py
index eddbf6de9aa..02d4d82c0f4 100644
--- a/openpype/hosts/tvpaint/lib.py
+++ b/openpype/hosts/tvpaint/lib.py
@@ -260,9 +260,9 @@ def _cleanup_frame_references(output_idx_by_frame_idx):
         real_reference_idx = reference_idx
         _tmp_reference_idx = reference_idx
         while True:
-            #to avoid not finding key (outside the range) we make a get
             _temp = output_idx_by_frame_idx.get(_tmp_reference_idx)
             if not _temp:
+                # Key outside the range, skip
                 break
             if _temp == _tmp_reference_idx:
                 real_reference_idx = _tmp_reference_idx