From 32bb42e37922dd2de79f01c6e133b17ee8e7c6fa Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Tue, 28 Mar 2023 17:26:04 +0800
Subject: [PATCH] update the obj loader and add maintained_selection for
 loaders

---
 openpype/hosts/max/plugins/load/load_model.py     | 12 ++++++++----
 openpype/hosts/max/plugins/load/load_model_fbx.py |  4 ++++
 openpype/hosts/max/plugins/load/load_model_obj.py | 12 ++++++++----
 openpype/hosts/max/plugins/load/load_model_usd.py |  4 ++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/max/plugins/load/load_model.py b/openpype/hosts/max/plugins/load/load_model.py
index c248d75718..95ee014e07 100644
--- a/openpype/hosts/max/plugins/load/load_model.py
+++ b/openpype/hosts/max/plugins/load/load_model.py
@@ -5,6 +5,7 @@ from openpype.pipeline import (
 )
 from openpype.hosts.max.api.pipeline import containerise
 from openpype.hosts.max.api import lib
+from openpype.hosts.max.api.lib import maintained_selection
 
 
 class ModelAbcLoader(load.LoaderPlugin):
@@ -57,12 +58,8 @@ importFile @"{file_path}" #noPrompt
 
     def update(self, container, representation):
         from pymxs import runtime as rt
-
         path = get_representation_path(representation)
         node = rt.getNodeByName(container["instance_node"])
-        lib.imprint(container["instance_node"], {
-            "representation": str(representation["_id"])
-        })
         rt.select(node.Children)
 
         for alembic in rt.selection:
@@ -76,6 +73,13 @@ importFile @"{file_path}" #noPrompt
                     alembic_obj = rt.getNodeByName(abc_obj.name)
                     alembic_obj.source = path
 
+        with maintained_selection():
+            rt.select(node)
+
+        lib.imprint(container["instance_node"], {
+            "representation": str(representation["_id"])
+        })
+
     def switch(self, container, representation):
         self.update(container, representation)
 
diff --git a/openpype/hosts/max/plugins/load/load_model_fbx.py b/openpype/hosts/max/plugins/load/load_model_fbx.py
index d8f4011277..88b8f1ed89 100644
--- a/openpype/hosts/max/plugins/load/load_model_fbx.py
+++ b/openpype/hosts/max/plugins/load/load_model_fbx.py
@@ -5,6 +5,7 @@ from openpype.pipeline import (
 )
 from openpype.hosts.max.api.pipeline import containerise
 from openpype.hosts.max.api import lib
+from openpype.hosts.max.api.lib import maintained_selection
 
 
 class FbxModelLoader(load.LoaderPlugin):
@@ -59,6 +60,9 @@ importFile @"{path}" #noPrompt using:FBXIMP
         """)
         rt.execute(fbx_reimport_cmd)
 
+        with maintained_selection():
+            rt.select(node)
+
         lib.imprint(container["instance_node"], {
             "representation": str(representation["_id"])
         })
diff --git a/openpype/hosts/max/plugins/load/load_model_obj.py b/openpype/hosts/max/plugins/load/load_model_obj.py
index 63ae058ae0..c55e462111 100644
--- a/openpype/hosts/max/plugins/load/load_model_obj.py
+++ b/openpype/hosts/max/plugins/load/load_model_obj.py
@@ -5,6 +5,7 @@ from openpype.pipeline import (
 )
 from openpype.hosts.max.api.pipeline import containerise
 from openpype.hosts.max.api import lib
+from openpype.hosts.max.api.lib import maintained_selection
 
 
 class ObjLoader(load.LoaderPlugin):
@@ -42,16 +43,19 @@ class ObjLoader(load.LoaderPlugin):
         path = get_representation_path(representation)
         node_name = container["instance_node"]
         node = rt.getNodeByName(node_name)
+
         instance_name, _ = node_name.split("_")
+        container = rt.getNodeByName(instance_name)
+        for n in container.Children:
+            rt.delete(n)
 
         rt.execute(f'importFile @"{path}" #noPrompt using:ObjImp')
-        # create "missing" container for obj import
-        container = rt.container()
-        container.name = f"{instance_name}"
         # get current selection
         for selection in rt.getCurrentSelection():
             selection.Parent = container
-            container.Parent = node
+
+        with maintained_selection():
+            rt.select(node)
 
         lib.imprint(node_name, {
             "representation": str(representation["_id"])
diff --git a/openpype/hosts/max/plugins/load/load_model_usd.py b/openpype/hosts/max/plugins/load/load_model_usd.py
index 2237426187..143f91f40b 100644
--- a/openpype/hosts/max/plugins/load/load_model_usd.py
+++ b/openpype/hosts/max/plugins/load/load_model_usd.py
@@ -4,6 +4,7 @@ from openpype.pipeline import (
 )
 from openpype.hosts.max.api.pipeline import containerise
 from openpype.hosts.max.api import lib
+from openpype.hosts.max.api.lib import maintained_selection
 
 
 class ModelUSDLoader(load.LoaderPlugin):
@@ -60,6 +61,9 @@ class ModelUSDLoader(load.LoaderPlugin):
         asset = rt.getNodeByName(f"{instance_name}")
         asset.Parent = node
 
+        with maintained_selection():
+            rt.select(node)
+
         lib.imprint(node_name, {
             "representation": str(representation["_id"])
         })