Merge pull request #358 from Unity-Technologies/UNI-42094-animated-skinned-mesh-transforms

UNI-42094 don't export skinned mesh transform if "animated skinned mesh" off

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -2342,7 +2342,8 @@ public AnimationOnlyExportData(
 
                 public void ComputeObjectsInAnimationClips(
                     AnimationClip[] animClips, 
-                    GameObject animationRootObject
+                    GameObject animationRootObject,
+                    bool exportSkinnedMeshAnim = true
                 ){
                     foreach (var animClip in animClips) {
                         if (this.animationClips.ContainsKey(animClip)) {
@@ -2363,6 +2364,10 @@ GameObject animationRootObject
                                 continue;
                             }
 
+                            if (!exportSkinnedMeshAnim && unityGo.GetComponent<SkinnedMeshRenderer>()) {
+                                continue;
+                            }
+
                             if (lightProps.Contains (uniCurveBinding.propertyName)) {
                                 this.exportComponent.Add (unityGo, typeof(Light));
                             } else if (cameraProps.Contains (uniCurveBinding.propertyName)) {
@@ -2720,7 +2725,7 @@ protected Dictionary<GameObject, AnimationOnlyExportData> GetTimelineAnimationEx
                 var exportComponent = new Dictionary<GameObject, System.Type>();
 
                 var exportData = new AnimationOnlyExportData(animationClips, goToExport, exportComponent);
-                exportData.ComputeObjectsInAnimationClips(animationClipsList.ToArray(), rootObject);
+                exportData.ComputeObjectsInAnimationClips(animationClipsList.ToArray(), rootObject, ExportOptions.AnimateSkinnedMesh);
 
                 Dictionary<GameObject, AnimationOnlyExportData> data = new Dictionary<GameObject, AnimationOnlyExportData>();
                 data.Add(rootObject, exportData);
@@ -2758,7 +2763,7 @@ protected Dictionary<GameObject, AnimationOnlyExportData> GetAnimationExportData
                         }
 
                         var animClips = AnimationUtility.GetAnimationClips(anim.gameObject);
-                        exportData.ComputeObjectsInAnimationClips(animClips, anim.gameObject);
+                        exportData.ComputeObjectsInAnimationClips(animClips, anim.gameObject, ExportOptions.AnimateSkinnedMesh);
                     }
 
                     int depthFromRootAnimator = int.MaxValue;
@@ -2777,7 +2782,7 @@ protected Dictionary<GameObject, AnimationOnlyExportData> GetAnimationExportData
                         var controller = anim.runtimeAnimatorController;
                         if (controller)
                         {
-                            exportData.ComputeObjectsInAnimationClips(controller.animationClips, anim.gameObject);
+                            exportData.ComputeObjectsInAnimationClips(controller.animationClips, anim.gameObject, ExportOptions.AnimateSkinnedMesh);
                         }
                     }