fix so copy component works well with default export behavior

with multi file export we don't have to worry about the hierarchy being
the same, everything should just match

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -57,22 +57,16 @@ private static List<GameObject> OnConvertInPlace ()
 
                 GameObject [] unityActiveGOs = Selection.GetFiltered<GameObject> (SelectionMode.Editable | SelectionMode.TopLevel);
 
-                var exportSet = ModelExporter.RemoveDuplicateObjects (unityActiveGOs);
+                var exportSet = ModelExporter.RemoveRedundantObjects (unityActiveGOs);
                 GameObject[] gosToExport = new GameObject[exportSet.Count];
                 exportSet.CopyTo (gosToExport);
 
                 // find common ancestor root & filePath;
                 string[] filePaths = new string[gosToExport.Length];
                 string dirPath = Path.Combine (Application.dataPath, "Objects");
 
-                Transform[] unityCommonAncestors = new Transform[gosToExport.Length];
-                int[] siblingIndices = new int[gosToExport.Length];
-
                 for(int n = 0; n < gosToExport.Length; n++){
-                    GameObject goObj = gosToExport[n];
-                    unityCommonAncestors[n] = goObj.transform.parent;
-                    siblingIndices [n] = goObj.transform.GetSiblingIndex ();
-                    filePaths[n] = Path.Combine (dirPath, goObj.name + ".fbx");
+                    filePaths[n] = Path.Combine (dirPath, gosToExport[n].name + ".fbx");
                 }
 
                 string[] fbxFileNames = new string[filePaths.Length];
@@ -110,28 +104,23 @@ private static List<GameObject> OnConvertInPlace ()
                         {
                             GameObject unityGO = unityObj as GameObject;
                             Transform unityGOTransform = unityGO.transform;
+                            Transform origGOTransform = gosToExport [i].transform;
 
                             // Set the name to be the name of the instantiated asset.
                             // This will get rid of the "(Clone)" if it's added
                             unityGO.name = unityMainAsset.name;
 
                             // configure transform and maintain local pose
-                            unityGO.transform.SetParent (unityCommonAncestors[i], false);
+                            unityGOTransform.SetParent (origGOTransform.parent, false);
 
-                            unityGO.transform.SetSiblingIndex (siblingIndices[i]);
+                            unityGOTransform.SetSiblingIndex (origGOTransform.GetSiblingIndex());
 
                             // copy the components over, assuming that the hierarchy order is unchanged
-                            if (unityActiveGOs.Length == 1) {
-                                CopyComponentsRecursive (unityActiveGOs [0], unityGO);
-                            } else {
-                                if (unityActiveGOs.Length != unityGOTransform.childCount) {
-                                    Debug.LogWarning (string.Format ("Warning: Exported {0} objects, but only imported {1}",
-                                        unityActiveGOs.Length, unityGOTransform.childCount));
-                                }
-                                for (int i = 0, c = unityGOTransform.childCount; i < c; i++) {
-                                    CopyComponentsRecursive (unityActiveGOs [i], unityGOTransform.GetChild (i).gameObject);
-                                }
+                            if (origGOTransform.hierarchyCount != unityGOTransform.hierarchyCount) {
+                                Debug.LogWarning (string.Format ("Warning: Exported {0} objects, but only imported {1}",
+                                    origGOTransform.hierarchyCount, unityGOTransform.hierarchyCount));
                             }
+                            CopyComponentsRecursive (gosToExport[i], unityGO);
 
                             result.Add (unityObj as GameObject);
 

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -508,7 +508,7 @@ public int GetHierarchyCount (HashSet<GameObject> exportSet)
             /// </summary>
             /// <returns>The revised export set</returns>
             /// <param name="unityExportSet">Unity export set.</param>
-            protected HashSet<GameObject> RemoveRedundantObjects(IEnumerable<UnityEngine.Object> unityExportSet)
+            public static HashSet<GameObject> RemoveRedundantObjects(IEnumerable<UnityEngine.Object> unityExportSet)
             {
                 // basically just remove the descendents from the unity export set
                 HashSet<GameObject> toExport = new HashSet<GameObject> ();