Merge pull request #442 from Unity-Technologies/UNI-55002-fix-broken-anim-only-export

Uni 55002 fix broken anim only export

Author: vkovec

Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporter.cs

@@ -3417,13 +3417,26 @@ internal int ExportAll (
                     int exportProgress = 0;
                     IEnumerable<GameObject> revisedExportSet = null;
 
+                    // Total # of objects to be exported
+                    // Used by progress bar to show how many objects will be exported in total
+                    // i.e. exporting x/count... 
                     int count = 0;
+
+                    // number of object hierarchies being exported.
+                    // Used to figure out exported transforms for root objects.
+                    // i.e. if we are exporting a single hierarchy at local position, then it's root is set to zero,
+                    // but if we are exporting multiple hierarchies at local position, then each hierarchy will be recentered according
+                    // to the center of the bounding box.
+                    int rootObjCount = 0; 
+
                     if(animOnly){
                         count = GetAnimOnlyHierarchyCount(exportData);
                         revisedExportSet = from entry in exportData select entry.Key;
+                        rootObjCount = exportData.Keys.Count;
                     } else {
                         var revisedGOSet = RemoveRedundantObjects(unityExportSet);
                         count = GetHierarchyCount (revisedGOSet);
+                        rootObjCount = revisedGOSet.Count;
                         revisedExportSet = revisedGOSet;
                     }
 
@@ -3438,7 +3451,7 @@ internal int ExportAll (
                     switch(ExportOptions.ObjectPosition){
                     case ExportSettings.ObjectPosition.LocalCentered:
                         // one object to export -> move to (0,0,0)
-                        if(count == 1){
+                        if(rootObjCount == 1){
                             var tempList = new List<GameObject>(revisedExportSet);
                             center = tempList[0].transform.position;
                             break;

Packages/com.unity.formats.fbx/Editor/Scripts/IExportData.cs

@@ -80,18 +80,18 @@ IExportOptions exportOptions
                 Object uniObj = AnimationUtility.GetAnimatedObject(rootObject, uniCurveBinding);
                 if (!uniObj)
                 {
-                    return;
+                    continue;
                 }
 
                 GameObject unityGo = ModelExporter.GetGameObject(uniObj);
                 if (!unityGo)
                 {
-                    return;
+                    continue;
                 }
 
                 if (!exportOptions.AnimateSkinnedMesh && unityGo.GetComponent<SkinnedMeshRenderer>())
                 {
-                    return;
+                    continue;
                 }
 
                 // If we have a clip driving a camera or light then force the export of FbxNodeAttribute