From e6b3492cc54b6a8d2d2642e81faaaedfcae43944 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 30 Apr 2024 06:36:33 +0200
Subject: [PATCH 1/2] Preserve time units on load and update with
 `MayaUSDReferenceLoader`

---
 .../hosts/maya/plugins/load/load_reference.py | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/load/load_reference.py b/client/ayon_core/hosts/maya/plugins/load/load_reference.py
index 847591bd11..a26982ddfa 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_reference.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_reference.py
@@ -14,6 +14,26 @@ from ayon_core.hosts.maya.api.lib import (
 )
 
 
+@contextlib.contextmanager
+def preserve_time_units():
+    """Preserve current frame, frame range and fps"""
+    frame = cmds.currentTime(query=True)
+    fps = cmds.currentUnit(query=True, time=True)
+    start = cmds.playbackOptions(query=True, minTime=True)
+    end = cmds.playbackOptions(query=True, maxTime=True)
+    anim_start = cmds.playbackOptions(query=True, animationStartTime=True)
+    anim_end = cmds.playbackOptions(query=True, animationEndTime=True)
+    try:
+        yield
+    finally:
+        cmds.currentUnit(time=fps, updateAnimation=False)
+        cmds.currentTime(frame)
+        cmds.playbackOptions(minTime=start,
+                             maxTime=end,
+                             animationStartTime=anim_start,
+                             animationEndTime=anim_end)
+
+
 @contextlib.contextmanager
 def preserve_modelpanel_cameras(container, log=None):
     """Preserve camera members of container in the modelPanels.
@@ -349,6 +369,15 @@ class MayaUSDReferenceLoader(ReferenceLoader):
         ])
         options["file_type"] = self.file_type
 
-        return super(MayaUSDReferenceLoader, self).process_reference(
-            context, name, namespace, options
-        )
+        # Maya USD import reference has the tendency to change the time slider
+        # range and current frame, so we force revert it after
+        with preserve_time_units():
+            return super(MayaUSDReferenceLoader, self).process_reference(
+                context, name, namespace, options
+            )
+
+    def update(self, container, context):
+        # Maya USD import reference has the tendency to change the time slider
+        # range and current frame, so we force revert it after
+        with preserve_time_units():
+            super(MayaUSDReferenceLoader, self).update(container, context)

From 34432b299fe666d7cf208ae880b64b5c75e75d51 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 3 Jun 2024 16:41:29 +0200
Subject: [PATCH 2/2] Bump version

---
 server_addon/maya/package.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py
index 274f74869b..0331fb2fb6 100644
--- a/server_addon/maya/package.py
+++ b/server_addon/maya/package.py
@@ -1,6 +1,6 @@
 name = "maya"
 title = "Maya"
-version = "0.2.0"
+version = "0.2.1"
 
 ayon_required_addons = {
     "core": ">0.3.2",