From 557aafdae326e5799f9258f02e5f27ef5ecb5f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Tue, 5 Apr 2022 14:36:11 +0200
Subject: [PATCH] fixed skeletal root

---
 .../publish/extract_unreal_skeletalmesh.py       | 16 +++++-----------
 openpype/plugins/publish/integrate_new.py        |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/extract_unreal_skeletalmesh.py b/openpype/hosts/maya/plugins/publish/extract_unreal_skeletalmesh.py
index 4dcad47e8c..7ef7f2f181 100644
--- a/openpype/hosts/maya/plugins/publish/extract_unreal_skeletalmesh.py
+++ b/openpype/hosts/maya/plugins/publish/extract_unreal_skeletalmesh.py
@@ -55,25 +55,19 @@ class ExtractUnrealSkeletalMesh(openpype.api.Extractor):
         # variant we extract we need to rename top node of the rig correctly.
         # It is finally done in context manager so it won't affect current
         # scene.
-        parent = "{}{}".format(
-            instance.data["asset"],
-            instance.data.get("variant", "")
-        )
 
-        joints_parents = cmds.ls(joints, long=True)
-        geo_parents = cmds.ls(geo, long=True)
+        # we rely on hierarchy under one root.
+        original_parent = to_extract[0].split("|")[1]
 
-        parent_node = {
-            parent.split("|")[1] for parent in (joints_parents + geo_parents)
-        }.pop()
+        parent_node = instance.data.get("asset")
 
         renamed_to_extract = []
         for node in to_extract:
             node_path = node.split("|")
-            node_path[1] = parent
+            node_path[1] = parent_node
             renamed_to_extract.append("|".join(node_path))
 
-        with renamed(parent_node, parent):
+        with renamed(original_parent, parent_node):
             self.log.info("Extracting: {}".format(renamed_to_extract, path))
             fbx_exporter.export(renamed_to_extract, path)
 
diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py
index afa4e0a9cf..acdb05dd93 100644
--- a/openpype/plugins/publish/integrate_new.py
+++ b/openpype/plugins/publish/integrate_new.py
@@ -107,7 +107,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 "hda",
                 "usd",
                 "staticMesh",
-                "skeletalMesh"
+                "skeletalMesh",
                 "usdComposition",
                 "usdOverride"
                 ]