From 86f86db4f84db54eecd127cbac528f3f9752107e Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 16 Aug 2023 17:55:07 +0800
Subject: [PATCH] also resolves OP-6526_3dsMax-loading-an-asset-multiple-times

---
 openpype/hosts/max/api/pipeline.py                | 4 ++--
 openpype/hosts/max/plugins/load/load_max_scene.py | 6 +++++-
 openpype/hosts/max/plugins/load/load_model_fbx.py | 6 +-----
 openpype/hosts/max/plugins/load/load_model_obj.py | 8 +++-----
 openpype/hosts/max/plugins/load/load_model_usd.py | 1 +
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/openpype/hosts/max/api/pipeline.py b/openpype/hosts/max/api/pipeline.py
index 08ff5c6baf..f58bd05a13 100644
--- a/openpype/hosts/max/api/pipeline.py
+++ b/openpype/hosts/max/api/pipeline.py
@@ -188,7 +188,7 @@ def import_custom_attribute_data(container: str, selections: list):
 
     Args:
         container (str): target container which adds custom attributes
-        selections (_type_): nodes to be added into
+        selections (list): nodes to be added into
         group in custom attributes
     """
     attrs = load_custom_attribute_data()
@@ -216,7 +216,7 @@ def update_custom_attribute_data(container: str, selections: list):
 
     Args:
         container (str): target container which adds custom attributes
-        selections (_type_): nodes to be added into
+        selections (list): nodes to be added into
         group in custom attributes
     """
     if container.modifiers[0].name == "OP Data":
diff --git a/openpype/hosts/max/plugins/load/load_max_scene.py b/openpype/hosts/max/plugins/load/load_max_scene.py
index 7bbc6419b8..2f5108aec5 100644
--- a/openpype/hosts/max/plugins/load/load_max_scene.py
+++ b/openpype/hosts/max/plugins/load/load_max_scene.py
@@ -51,7 +51,11 @@ class MaxSceneLoader(load.LoaderPlugin):
         rt.MergeMaxFile(path, rt.Name("deleteOldDups"))
         new_container = rt.Container(name=inst_name)
         max_objects = rt.getLastMergedNodes()
-
+        current_max_objects = rt.getLastMergedNodes()
+        for current_object in current_max_objects:
+            prev_max_objects = prev_max_objects.remove(current_object)
+        for prev_object in prev_max_objects:
+            rt.Delete(prev_object)
         max_objects_list = []
         max_objects_list.append(new_container)
         max_objects_list.extend(max_objects)
diff --git a/openpype/hosts/max/plugins/load/load_model_fbx.py b/openpype/hosts/max/plugins/load/load_model_fbx.py
index 26520307c9..d076bf2de9 100644
--- a/openpype/hosts/max/plugins/load/load_model_fbx.py
+++ b/openpype/hosts/max/plugins/load/load_model_fbx.py
@@ -26,11 +26,7 @@ class FbxModelLoader(load.LoaderPlugin):
         rt.FBXImporterSetParam("Preserveinstances", True)
         rt.importFile(filepath, rt.name("noPrompt"), using=rt.FBXIMP)
 
-        container = rt.GetNodeByName(name)
-        if not container:
-            container = rt.Container()
-            container.name = name
-
+        container = rt.Container(name=name)
         selections = rt.GetCurrentSelection()
         import_custom_attribute_data(container, selections)
 
diff --git a/openpype/hosts/max/plugins/load/load_model_obj.py b/openpype/hosts/max/plugins/load/load_model_obj.py
index 05f37f9e5a..bac5b8b4f3 100644
--- a/openpype/hosts/max/plugins/load/load_model_obj.py
+++ b/openpype/hosts/max/plugins/load/load_model_obj.py
@@ -27,18 +27,16 @@ class ObjLoader(load.LoaderPlugin):
 
         rt.Execute(f'importFile @"{filepath}" #noPrompt using:ObjImp')
         # create "missing" container for obj import
-        container = rt.Container()
-        container.name = name
+        container = rt.Container(name=name)
         selections = rt.GetCurrentSelection()
         import_custom_attribute_data(container, selections)
         # get current selection
         for selection in selections:
             selection.Parent = container
-
-        asset = rt.GetNodeByName(name)
+            self.log.debug(f"{container.ClassID}")
 
         return containerise(
-            name, [asset], context, loader=self.__class__.__name__)
+            name, [container], context, loader=self.__class__.__name__)
 
     def update(self, container, representation):
         from pymxs import runtime as rt
diff --git a/openpype/hosts/max/plugins/load/load_model_usd.py b/openpype/hosts/max/plugins/load/load_model_usd.py
index 425b152278..d3669fc10e 100644
--- a/openpype/hosts/max/plugins/load/load_model_usd.py
+++ b/openpype/hosts/max/plugins/load/load_model_usd.py
@@ -35,6 +35,7 @@ class ModelUSDLoader(load.LoaderPlugin):
         rt.USDImporter.importFile(filepath,
                                   importOptions=import_options)
         asset = rt.GetNodeByName(name)
+
         import_custom_attribute_data(asset, asset.Children)
 
         return containerise(