From b70051b768e1b4b126b3f17fd2a734ab486edc58 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 23 May 2023 17:55:54 +0200
Subject: [PATCH] Preserve comp frame range after rendering

---
 openpype/hosts/fusion/api/lib.py              | 33 +++++++++++++++++--
 .../plugins/publish/extract_render_local.py   | 19 ++++++-----
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py
index c33209823e..1c486783be 100644
--- a/openpype/hosts/fusion/api/lib.py
+++ b/openpype/hosts/fusion/api/lib.py
@@ -256,8 +256,11 @@ def switch_item(container,
 
 
 @contextlib.contextmanager
-def maintained_selection():
-    comp = get_current_comp()
+def maintained_selection(comp=None):
+    """Reset comp selection from before the context after the context"""
+    if comp is None:
+        comp = get_current_comp()
+
     previous_selection = comp.GetToolList(True).values()
     try:
         yield
@@ -268,6 +271,32 @@ def maintained_selection():
             for tool in previous_selection:
                 flow.Select(tool, True)
 
+@contextlib.contextmanager
+def maintained_comp_range(comp=None,
+                          global_start=True,
+                          global_end=True,
+                          render_start=True,
+                          render_end=True):
+    """Reset comp frame ranges from before the context after the context"""
+    if comp is None:
+        comp = get_current_comp()
+
+    comp_attrs = comp.GetAttrs()
+    preserve_attrs = {}
+    if global_start:
+        preserve_attrs["COMPN_GlobalStart"] = comp_attrs["COMPN_GlobalStart"]
+    if global_end:
+        preserve_attrs["COMPN_GlobalEnd"] = comp_attrs["COMPN_GlobalEnd"]
+    if render_start:
+        preserve_attrs["COMPN_RenderStart"] = comp_attrs["COMPN_RenderStart"]
+    if render_end:
+        preserve_attrs["COMPN_RenderEnd"] = comp_attrs["COMPN_RenderEnd"]
+
+    try:
+        yield
+    finally:
+        comp.SetAttrs(preserve_attrs)
+
 
 def get_frame_path(path):
     """Get filename for the Fusion Saver with padded number as '#'
diff --git a/openpype/hosts/fusion/plugins/publish/extract_render_local.py b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
index 564dca1796..25c101cf00 100644
--- a/openpype/hosts/fusion/plugins/publish/extract_render_local.py
+++ b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
@@ -6,7 +6,7 @@ import pyblish.api
 
 from openpype.pipeline import publish
 from openpype.hosts.fusion.api import comp_lock_and_undo_chunk
-from openpype.hosts.fusion.api.lib import get_frame_path
+from openpype.hosts.fusion.api.lib import get_frame_path, maintained_comp_range
 
 log = logging.getLogger(__name__)
 
@@ -114,14 +114,15 @@ class FusionRenderLocal(
         self.log.info(f"Rendering tools: {saver_names}")
 
         with comp_lock_and_undo_chunk(current_comp):
-            with enabled_savers(current_comp, savers_to_render):
-                result = current_comp.Render(
-                    {
-                        "Start": frame_start,
-                        "End": frame_end,
-                        "Wait": True,
-                    }
-                )
+            with maintained_comp_range(current_comp):
+                with enabled_savers(current_comp, savers_to_render):
+                    result = current_comp.Render(
+                        {
+                            "Start": frame_start,
+                            "End": frame_end,
+                            "Wait": True,
+                        }
+                    )
 
         # Store the render state for all the rendered instances
         for render_instance in render_instances: