Merge branch 'master' into UNI-32798-1.3.0b1-forum-release

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);
                         }
                     }
 

Assets/Integrations/Autodesk/maya/scripts/unityCommands.mel

@@ -1,4 +1,3 @@
-global string $UnityExportSets[];
 global string $UnityFbxFilePathAttr = "unityFbxModelFilePath";
 global string $UnityFbxFileNameAttr = "unityFbxModelFileName";
 global string $UnityFbxAnimFilePathAttr = "unityFbxAnimFilePath";
@@ -136,7 +135,6 @@ proc string checkNamespaceNeedsUpdate(string $unitySet, string $unityFbxNamespac
 
 proc importFile(string $filePathStr){
     // get the global variables
-    global string $UnityExportSets[];
     global string $UnityFbxFilePathAttr;
     global string $UnityFbxFileNameAttr;
     global string $UnityFbxAnimFilePathAttr;
@@ -278,10 +276,6 @@ proc importFile(string $filePathStr){
         }
         // lock set so it doesn't get deleted when empty
         lockNode -lock true $unityExportSet;
-        
-        if(!stringArrayContains($unityExportSet, $UnityExportSets)){
-            $UnityExportSets[size($UnityExportSets)] = $unityExportSet;
-        }
     }
 }
 
@@ -418,9 +412,41 @@ proc exportSet(string $unitySet, int $exportAnim){
     }
 }
 
+proc int isUnityExportSet(string $mayaSet){
+    global string $UnityFbxFilePathAttr;
+    global string $UnityFbxFileNameAttr;
+
+    if(!endsWith($mayaSet, "_UnityExportSet")){
+        return false;
+    }
+    
+    if(!`attributeExists $UnityFbxFilePathAttr $mayaSet`){
+        return false;
+    }
+    
+    if(!`attributeExists $UnityFbxFileNameAttr $mayaSet`){
+        return false;
+    }
+    return true;
+}
+
+proc string[] getUnityExportSets(){
+    //if the selection set ends w "_UnityExportSet" and it has at least the custom attributes UnityFbxModelFilePath & UnityFbxModelFileName then it's one of ours.
+    string $unityExportSets[];
+    
+    string $mayaSets[] = `listSets -allSets`;
+    
+    int $i = 0;
+    for($k=0; $k<size($mayaSets); ++$k){
+        if(isUnityExportSet($mayaSets[$k])){
+            $unityExportSets[$i] = $mayaSets[$k];
+            $i++;
+        }
+    }
+    return $unityExportSets;
+}
+
 proc unityExport(int $exportType){
-    // get the global variables
-    global string $UnityExportSets[];
 
     if(!loadUnityDependencies()){
         return;
@@ -454,7 +480,8 @@ proc unityExport(int $exportType){
 
     $i = 0;
     string $setsToExport[];
-    for($exportSet in $UnityExportSets){
+    string $unityExportSets[] = getUnityExportSets();
+    for($exportSet in $unityExportSets){
         if(!setExists($exportSet)){
             continue;
         }