Merge pull request #372 from Unity-Technologies/Uni-42430-export-camera-editorclips2

 Uni-42430 Export Light and Camera FbxNodeAttribute w/ animation

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -2325,10 +2325,6 @@ public struct AnimationOnlyExportData {
                 // first clip to export
                 public AnimationClip defaultClip;
 
-                // TODO: find a better way to keep track of which components + properties we support
-                private static List<string> cameraProps = new List<string>{"field of view"};
-                private static List<string> lightProps = new List<string>{"m_Intensity", "m_SpotAngle", "m_Color.r", "m_Color.g", "m_Color.b"};
-
                 public AnimationOnlyExportData(
                     Dictionary<AnimationClip, GameObject> animClips,
                     HashSet<GameObject> exportSet,
@@ -2345,6 +2341,9 @@ public void ComputeObjectsInAnimationClips(
                     GameObject animationRootObject,
                     bool exportSkinnedMeshAnim = true
                 ){
+                    // NOTE: the object (animationRootObject) containing the animation is not necessarily animated
+                    // when driven by an animator or animation component.
+
                     foreach (var animClip in animClips) {
                         if (this.animationClips.ContainsKey(animClip)) {
                             // we have already exported gameobjects for this clip
@@ -2368,11 +2367,12 @@ public void ComputeObjectsInAnimationClips(
                                 continue;
                             }
 
-                            if (lightProps.Contains (uniCurveBinding.propertyName)) {
-                                this.exportComponent.Add (unityGo, typeof(Light));
-                            } else if (cameraProps.Contains (uniCurveBinding.propertyName)) {
-                                this.exportComponent.Add (unityGo, typeof(Camera));
-                            }
+                            // If we have a clip driving a camera or light then force the export of FbxNodeAttribute
+                            // so that they point the right way when imported into Maya.
+                            if (unityGo.GetComponent<Light>())
+                                this.exportComponent[unityGo] = typeof(Light);
+                            else if (unityGo.GetComponent<Camera>())
+                                this.exportComponent[unityGo] = typeof(Camera);
 
                             this.goExportSet.Add (unityGo);
                         }

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

@@ -234,7 +234,7 @@ proc importFile(string $filePathStr){
         storeAttribute($unityExportSet, $UnityFbxFileNameAttr, "");
         storeAttribute($unityExportSet, $UnityFbxNamespaceAttr, "");
     }
-    
+
     if(`namespaceInfo -cur -an` != $targetNamespace){
         namespace -set $targetNamespace;
     }