From 6706e90d1852f063670fcba5a1e630dde0c19a17 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Fri, 11 Mar 2022 12:41:14 +0100
Subject: [PATCH] =?UTF-8?q?Fixes=20for=20=F0=9F=8E=AB=20OP-2825?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 openpype/hosts/maya/api/plugin.py              |  3 ++-
 .../hosts/maya/plugins/load/load_reference.py  |  8 +-------
 .../plugins/publish/extract_maya_scene_raw.py  | 18 +++++++-----------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/openpype/hosts/maya/api/plugin.py b/openpype/hosts/maya/api/plugin.py
index e0c21645e4..feaceacebc 100644
--- a/openpype/hosts/maya/api/plugin.py
+++ b/openpype/hosts/maya/api/plugin.py
@@ -178,7 +178,7 @@ class ReferenceLoader(Loader):
                 loader=self.__class__.__name__
             )
             loaded_containers.append(container)
-            self._organize_containers([ref_node], container)
+            self._organize_containers(nodes, container)
             c += 1
             namespace = None
 
@@ -318,6 +318,7 @@ class ReferenceLoader(Loader):
     @staticmethod
     def _organize_containers(nodes, container):
         # type: (list, str) -> None
+        """Put containers in loaded data to correct hierarchy."""
         for node in nodes:
             id_attr = "{}.id".format(node)
             if not cmds.attributeQuery("id", node=node, exists=True):
diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py
index 66cf95a643..d358c62724 100644
--- a/openpype/hosts/maya/plugins/load/load_reference.py
+++ b/openpype/hosts/maya/plugins/load/load_reference.py
@@ -121,18 +121,12 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
             if family == "rig":
                 self._post_process_rig(name, namespace, context, options)
             else:
-
                 if "translate" in options:
                     cmds.setAttr(group_name + ".t", *options["translate"])
 
+            print(new_nodes)
             return new_nodes
 
-    def load(self, context, name=None, namespace=None, options=None):
-        container = super(ReferenceLoader, self).load(
-            context, name, namespace, options)
-        # clean containers if present to AVALON_CONTAINERS
-        self._organize_containers(self[:], container[0])
-
     def switch(self, container, representation):
         self.update(container, representation)
 
diff --git a/openpype/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/openpype/hosts/maya/plugins/publish/extract_maya_scene_raw.py
index 5cc7b52090..2e1260c374 100644
--- a/openpype/hosts/maya/plugins/publish/extract_maya_scene_raw.py
+++ b/openpype/hosts/maya/plugins/publish/extract_maya_scene_raw.py
@@ -58,16 +58,12 @@ class ExtractMayaSceneRaw(openpype.api.Extractor):
         else:
             members = instance[:]
 
-        loaded_containers = None
-        if set(self.add_for_families).intersection(
-                set(instance.data.get("families")),
-                set(instance.data.get("family").lower())):
-            loaded_containers = self._add_loaded_containers(members)
-
         selection = members
-        if loaded_containers:
-            self.log.info(loaded_containers)
-            selection += loaded_containers
+        if set(self.add_for_families).intersection(
+                set(instance.data.get("families"))) or \
+                instance.data.get("family") in self.add_for_families:
+            selection += self._add_loaded_containers(members)
+            self.log.info(selection)
 
         # Perform extraction
         self.log.info("Performing extraction ...")
@@ -105,7 +101,7 @@ class ExtractMayaSceneRaw(openpype.api.Extractor):
             if cmds.referenceQuery(ref, isNodeReferenced=True)
         ]
 
-        refs_to_include = set(refs_to_include)
+        members_with_refs = set(refs_to_include).union(members)
 
         obj_sets = cmds.ls("*.id", long=True, type="objectSet", recursive=True,
                            objectsOnly=True)
@@ -121,7 +117,7 @@ class ExtractMayaSceneRaw(openpype.api.Extractor):
                 continue
 
             set_content = set(cmds.sets(obj_set, query=True))
-            if set_content.intersection(refs_to_include):
+            if set_content.intersection(members_with_refs):
                 loaded_containers.append(obj_set)
 
         return loaded_containers