Merge pull request #66 from ynput/bugfix/OP-8125_3dsmax-removing-item-in-manager

Max: Bug fix the "remove items" not working in Scene Inventory Manager

client/ayon_core/hosts/max/api/pipeline.py

@@ -245,3 +245,27 @@ def get_previous_loaded_object(container: str):
         if str(obj) in sel_list:
             node_list.append(obj)
     return node_list
+
+
+def remove_container_data(container_node: str):
+    """Function to remove container data after updating, switching or deleting it.
+
+    Args:
+        container_node (str): container node
+    """
+    if container_node.modifiers[0].name == "OP Data":
+        all_set_members_names = [
+            member.node for member
+            in container_node.modifiers[0].openPypeData.all_handles]
+        # clean up the children of alembic dummy objects
+        for current_set_member in all_set_members_names:
+            shape_list = [members for members in current_set_member.Children
+                          if rt.ClassOf(members) == rt.AlembicObject
+                          or rt.isValidNode(members)]
+            if shape_list:  # noqa
+                rt.Delete(shape_list)
+            rt.Delete(current_set_member)
+        rt.deleteModifier(container_node, container_node.modifiers[0])
+
+    rt.Delete(container_node)
+    rt.redrawViews()

client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py

@@ -1,6 +1,6 @@
 import os
 
-from ayon_core.hosts.max.api import lib, maintained_selection
+from ayon_core.hosts.max.api import lib
 from ayon_core.hosts.max.api.lib import (
     unique_namespace,
     get_namespace,
@@ -9,7 +9,8 @@ from ayon_core.hosts.max.api.lib import (
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
     get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 from ayon_core.pipeline import get_representation_path, load
 
@@ -96,4 +97,4 @@ class FbxLoader(load.LoaderPlugin):
         from pymxs import runtime as rt
 
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_max_scene.py

@@ -8,7 +8,8 @@ from ayon_core.hosts.max.api.lib import (
 )
 from ayon_core.hosts.max.api.pipeline import (
     containerise, get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 from ayon_core.pipeline import get_representation_path, load
 
@@ -93,6 +94,5 @@ class MaxSceneLoader(load.LoaderPlugin):
 
     def remove(self, container):
         from pymxs import runtime as rt
-
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_model.py

@@ -2,7 +2,8 @@ import os
 from ayon_core.pipeline import load, get_representation_path
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
-    get_previous_loaded_object
+    get_previous_loaded_object,
+    remove_container_data
 )
 from ayon_core.hosts.max.api import lib
 from ayon_core.hosts.max.api.lib import (
@@ -97,9 +98,9 @@ class ModelAbcLoader(load.LoaderPlugin):
 
     def remove(self, container):
         from pymxs import runtime as rt
-
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)
+
 
     @staticmethod
     def get_container_children(parent, type_name):

client/ayon_core/hosts/max/plugins/load/load_model_fbx.py

@@ -2,7 +2,8 @@ import os
 from ayon_core.pipeline import load, get_representation_path
 from ayon_core.hosts.max.api.pipeline import (
     containerise, get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 from ayon_core.hosts.max.api import lib
 from ayon_core.hosts.max.api.lib import (
@@ -92,6 +93,5 @@ class FbxModelLoader(load.LoaderPlugin):
 
     def remove(self, container):
         from pymxs import runtime as rt
-
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_model_obj.py

@@ -11,7 +11,8 @@ from ayon_core.hosts.max.api.lib import maintained_selection
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
     get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 from ayon_core.pipeline import get_representation_path, load
 
@@ -84,6 +85,5 @@ class ObjLoader(load.LoaderPlugin):
 
     def remove(self, container):
         from pymxs import runtime as rt
-
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_model_usd.py

@@ -13,7 +13,8 @@ from ayon_core.hosts.max.api.lib import maintained_selection
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
     get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 from ayon_core.pipeline import get_representation_path, load
 
@@ -113,5 +114,6 @@ class ModelUSDLoader(load.LoaderPlugin):
         self.update(container, representation)
 
     def remove(self, container):
+        from pymxs import runtime as rt
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_pointcache.py

@@ -10,7 +10,8 @@ from ayon_core.hosts.max.api import lib, maintained_selection
 from ayon_core.hosts.max.api.lib import unique_namespace
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
-    get_previous_loaded_object
+    get_previous_loaded_object,
+    remove_container_data
 )
 
 
@@ -103,9 +104,9 @@ class AbcLoader(load.LoaderPlugin):
 
     def remove(self, container):
         from pymxs import runtime as rt
-
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)
+
 
     @staticmethod
     def get_container_children(parent, type_name):

client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py

@@ -4,7 +4,8 @@ from ayon_core.pipeline.load import LoadError
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
     get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 
 from ayon_core.hosts.max.api.lib import (
@@ -104,5 +105,6 @@ class OxAbcLoader(load.LoaderPlugin):
         self.update(container, representation)
 
     def remove(self, container):
+        from pymxs import runtime as rt
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_pointcloud.py

@@ -8,7 +8,8 @@ from ayon_core.hosts.max.api.lib import (
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
     get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 from ayon_core.pipeline import get_representation_path, load
 
@@ -63,6 +64,5 @@ class PointCloudLoader(load.LoaderPlugin):
     def remove(self, container):
         """remove the container"""
         from pymxs import runtime as rt
-
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py

@@ -9,7 +9,8 @@ from ayon_core.pipeline.load import LoadError
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
     update_custom_attribute_data,
-    get_previous_loaded_object
+    get_previous_loaded_object,
+    remove_container_data
 )
 from ayon_core.hosts.max.api import lib
 from ayon_core.hosts.max.api.lib import (
@@ -72,6 +73,5 @@ class RedshiftProxyLoader(load.LoaderPlugin):
 
     def remove(self, container):
         from pymxs import runtime as rt
-
-        node = rt.getNodeByName(container["instance_node"])
-        rt.delete(node)
+        node = rt.GetNodeByName(container["instance_node"])
+        remove_container_data(node)

client/ayon_core/hosts/max/plugins/load/load_tycache.py

@@ -7,7 +7,8 @@ from ayon_core.hosts.max.api.lib import (
 from ayon_core.hosts.max.api.pipeline import (
     containerise,
     get_previous_loaded_object,
-    update_custom_attribute_data
+    update_custom_attribute_data,
+    remove_container_data
 )
 from ayon_core.pipeline import get_representation_path, load
 
@@ -59,6 +60,5 @@ class TyCacheLoader(load.LoaderPlugin):
     def remove(self, container):
         """remove the container"""
         from pymxs import runtime as rt
-
         node = rt.GetNodeByName(container["instance_node"])
-        rt.Delete(node)
+        remove_container_data(node)