Merge branch 'master' into Uni-45921-physical-camera

# Conflicts:
#	Packages/com.unity.formats.fbx/Editor/Integrations.meta
#	Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporter.cs
#	Packages/com.unity.formats.fbxsdk/Scripts/FbxPropertyEGateFit.cs.meta

Author: inwoods

Assets/com.unity.formats.fbx.tests/FbxAnimationTest.cs

@@ -74,13 +74,6 @@ public static IEnumerable ContinuousRotationTestCases {
             }
         }
 
-        // test key tangents
-        public static IEnumerable KeyTangentsTestCases {
-            get {
-                yield return new TestCaseData (new float [3] { 0f, 4f, 5f }, new Vector3 [3] { new Vector3 (-100, 100, 0), new Vector3 (0f, 0.0f, 0f), new Vector3 (25f, 0f, 0f) }, new Vector3 [3] { new Vector3 (0, 0, 0), new Vector3 (0f, 0f, 16.9f), new Vector3 (0f, 0f, 0f) }).Returns (6);
-            }
-        }
-
         public static IEnumerable SkinnedMeshTestCases {
             get {
                 yield return "Models/DefaultMale/Male_DyingHitFromBack_Blend_T3_Cut01_James.fbx";
@@ -303,33 +296,6 @@ public virtual int Compare(Keyframe a, Keyframe b)
             }
         }
 
-        public class KeyTangentComparer : IComparer<Keyframe>
-        {
-            public int CompareKeyTangents(Keyframe a, Keyframe b)
-            {
-                bool result = true;
-
-                result &= a.time.Equals(b.time);
-                #if DEBUG_UNITTEST
-                Debug.Log(string.Format("{2} a.time: {0}, b.time: {1}", a.time, b.time,result));
-                #endif
-                // TODO : use AnimationUtility.GetLeftTangentMode 
-                // requires reference to AnimationCurve and keyindex
-                result &= (a.tangentMode == b.tangentMode);
-                #if DEBUG_UNITTEST
-                Debug.Log(string.Format("{2} a.tangentMode={0} b.tangentMode={1}", 
-                    ((AnimationUtility.TangentMode)a.tangentMode).ToString(),
-                    ((AnimationUtility.TangentMode)b.tangentMode).ToString(),result));
-                #endif
-                return result ? 0 : 1;
-            }
-
-            public int Compare(Keyframe a, Keyframe b)
-            {
-                return CompareKeyTangents(a,b);
-            }
-        }
-
         public class AnimTester
         {
             public FbxAnimationTest.KeyData keyData;
@@ -754,30 +720,6 @@ public int ContinuousRotationAnimTest (RotationCurveType rotCurveType, float []
             return tester.DoIt();
         }
 
-        [Description("Uni-35935 key tangents")]
-        [Test, TestCaseSource (typeof (AnimationTestDataClass), "KeyTangentsTestCases")]
-        public int KeyTangentsAnimTest (float [] keyTimesInSeconds, Vector3 [] keyPosValues, Vector3 [] keyRotValues)
-        {
-            System.Type componentType = typeof(Transform);
-
-            if (keyRotValues == null)
-            {
-                keyRotValues = new Vector3[keyPosValues.Length];
-            }
-                
-            string[] propertyNames = null;
-            string testName = componentType.ToString () + "_KeyTangents";
-            RotationCurveType rotCurveType = RotationCurveType.kEuler;
-                
-            testName += "_Euler";
-            propertyNames = AnimationTestDataClass.m_rotationEulerNames.Concat(AnimationTestDataClass.m_translationNames).ToArray();
-
-            KeyData keyData = new TransformKeyData { RotationType = rotCurveType, propertyNames = propertyNames, componentType = componentType, keyTimes = keyTimesInSeconds, keyPosValues = keyPosValues, keyEulerValues = keyRotValues };
-
-            var tester = new AnimTester {keyData=keyData, testName=testName, path=GetRandomFbxFilePath (), keyComparer=new KeyTangentComparer()};
-            return tester.DoIt();
-        }
-
         [Test, TestCaseSource (typeof (AnimationTestDataClass), "ComponentTestCases")]
         public int ComponentAnimTest (System.Type componentType)
         {

Assets/com.unity.formats.fbx.tests/ModelExporterTest.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+//#define DEBUG_UNITTEST
+using UnityEngine;
 using UnityEditor;
 using UnityEngine.TestTools;
 using NUnit.Framework;
@@ -10,6 +11,14 @@ namespace FbxExporters.UnitTests
 {
     public class ModelExporterTest : ExporterTestBase
     {
+        [TearDown]
+        public override void Term ()
+        {
+            #if (!DEBUG_UNITTEST)
+            base.Term ();
+            #endif
+        }
+        
         [Test]
         public void TestBasics ()
         {
@@ -322,7 +331,31 @@ public void TestExporterCallbacks()
         }
 
         [Test]
-        public void TestExportCamera(){
+        [Ignore("Ignore a camera orthographic test (Uni-48092)")]        
+        public void TestExportCamera2(){
+            // NOTE: even though the aspect ratio is exported,
+            //       it does not get imported back into Unity.
+            //       Therefore don't modify or check if camera.aspect is the same
+            //       after export.
+
+            // create a Unity camera
+            GameObject cameraObj = new GameObject("TestCamera");
+            Camera camera = cameraObj.AddComponent<Camera> ();
+
+            // test export orthographic camera
+            camera.orthographic = true;
+            camera.fieldOfView = 78;
+            camera.nearClipPlane = 19;
+            camera.farClipPlane = 500.6f;
+
+            var filename = GetRandomFbxFilePath (); // export to a different file
+            var fbxCamera = ExportCamera (filename, cameraObj);
+            CompareCameraValues (camera, fbxCamera);
+            Assert.AreEqual (camera.orthographicSize, fbxCamera.orthographicSize);
+        }
+
+        [Test]
+        public void TestExportCamera1(){
             // NOTE: even though the aspect ratio is exported,
             //       it does not get imported back into Unity.
             //       Therefore don't modify or check if camera.aspect is the same
@@ -342,17 +375,6 @@ public void TestExportCamera(){
             string filename = GetRandomFbxFilePath();
             var fbxCamera = ExportCamera (filename, cameraObj);
             CompareCameraValues (camera, fbxCamera);
-
-            // test export orthographic camera
-            camera.orthographic = true;
-            camera.fieldOfView = 78;
-            camera.nearClipPlane = 19;
-            camera.farClipPlane = 500.6f;
-
-            filename = GetRandomFbxFilePath (); // export to a different file
-            fbxCamera = ExportCamera (filename, cameraObj);
-            CompareCameraValues (camera, fbxCamera);
-            Assert.AreEqual (camera.orthographicSize, fbxCamera.orthographicSize);
         }
 
         /// <summary>

Packages/com.unity.formats.fbx/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 RELEASE NOTES
 
+**Version**: 1.5.0-preview
+
+NEW FEATURES
+
+* The roundtrip of assets can now be started from Maya from assets that have not been exported from Unity
+* DCC integration plug-in sources have been moved away from the package
+* Windows version is now using the FBX SDK version 2018.1.1
+* Streamlined public interface for the ModelExporter class
+
+FIXES:
+
+* DCC integration plug-ins now work with packman
+
 **Version**: 1.4.0-preview
 
 NEW FEATURES

Packages/com.unity.formats.fbx/Editor.meta

@@ -316,7 +316,7 @@ public static GameObject ApplyOrCreatePrefab(GameObject instance,
                 string prefabFullPath = null)
             {
                 if(PrefabUtility.GetPrefabType(instance) == PrefabType.PrefabInstance) {
-                    return PrefabUtility.ReplacePrefab(instance, PrefabUtility.GetPrefabParent(instance));
+                    return PrefabUtility.ReplacePrefab(instance, PrefabUtility.GetCorrespondingObjectFromSource(instance));
                 }
 
                 // Otherwise, create a new prefab. First choose its filename/path.
@@ -388,7 +388,7 @@ public static GameObject GetFbxAssetOrNull(GameObject go) {
                 switch(unityPrefabType) {
                 case PrefabType.ModelPrefabInstance:
                     if (go.Equals(PrefabUtility.FindPrefabRoot (go))) {
-                        return PrefabUtility.GetPrefabParent(go) as GameObject;
+                        return PrefabUtility.GetCorrespondingObjectFromSource(go) as GameObject;
                     } else {
                         return null;
                     }

Packages/com.unity.formats.fbx/Editor/Integrations.meta

@@ -1241,11 +1241,7 @@ protected bool ExportInstance (GameObject unityGo, FbxNode fbxNode, FbxScene fbx
                 if (unityPrefabType != PrefabType.PrefabInstance &&
                     unityPrefabType != PrefabType.ModelPrefabInstance) return false;
 
-                #if UNITY_2018_2_OR_NEWER
-                Object unityPrefabParent = PrefabUtility.GetCorrespondingObjectFromSource (unityGo);
-                #else
-                Object unityPrefabParent = PrefabUtility.GetPrefabParent (unityGo);
-                #endif
+                Object unityPrefabParent = PrefabUtility.GetCorrespondingObjectFromSource(unityGo);
 
                 if (Verbose)
                     Debug.Log (string.Format ("exporting instance {0}({1})", unityGo.name, unityPrefabParent.name));

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

@@ -257,7 +257,7 @@ public static bool OnValidateMenuItem()
             bool containsLinkedPrefab = false;
             foreach (GameObject selectedObject in selection)
             {
-                GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(selectedObject) as GameObject;
+                GameObject prefab = UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(selectedObject) as GameObject;
                 if (prefab && prefab.GetComponentInChildren<FbxPrefab>())
                 {
                     containsLinkedPrefab = true;
@@ -281,7 +281,7 @@ public static void UpdateLinkedPrefab(GameObject prefabOrInstance)
                 prefab = prefabOrInstance;
                 break;
             case PrefabType.PrefabInstance:
-                prefab = PrefabUtility.GetPrefabParent(prefabOrInstance) as GameObject;
+                prefab = PrefabUtility.GetCorrespondingObjectFromSource(prefabOrInstance) as GameObject;
                 break;
             default:
                 return;
@@ -1164,6 +1164,17 @@ public HashSet<String> GetNodesToRename()
                     return m_nodesToRename;
                 }
 
+                /// <summary>
+                /// Get the equivalent transform on the linked prefab for the given fbx transform.
+                /// e.g. if there is a transform called Bone1 in the fbx, find the transform called Bone1 in the prefab.
+                /// </summary>
+                /// <returns>The linked prefab transform that matches the given fbx transform or null if not found</returns>
+                private Transform GetMatchingPrefabTransform(Transform fbxTransform, Transform fbxAssetRoot, Transform prefabAssetRoot)
+                {
+                    var transformPath = AnimationUtility.CalculateTransformPath(fbxTransform, fbxAssetRoot);
+                    return prefabAssetRoot.Find(transformPath);
+                }
+
                 /// <summary>
                 /// Then we act -- in a slightly different order:
                 /// 1. Create all the new nodes we need to create.
@@ -1355,6 +1366,42 @@ public HashSet<GameObject> ImplementUpdates(FbxPrefab prefabInstance)
                             }
                             // Now set the values.
                             UnityEditor.EditorJsonUtility.FromJsonOverwrite(fbxComponent.jsonValue, prefabComponent);
+
+                            // if the prefab component is a skinned mesh renderer, then make sure to update the bone list so that
+                            // the bones are in the prefab, and not the fbx
+                            if (prefabComponent is SkinnedMeshRenderer)
+                            {
+                                var skinnedMeshComponent = prefabComponent as SkinnedMeshRenderer;
+                                var rootBone = skinnedMeshComponent.rootBone;
+                                var bones = skinnedMeshComponent.bones;
+
+                                var fbxAssetTransform = m_fbxPrefabUtility.GetFbxAsset().transform;
+                                
+                                var rootPrefabTransform = GetMatchingPrefabTransform(rootBone, fbxAssetTransform, prefabRoot);
+                                if (rootPrefabTransform == null)
+                                {
+                                    Debug.LogWarningFormat("FbxPrefabAutoUpdater: Could not find root bone {0} for {1} skinned mesh in linked prefab", rootBone.name, skinnedMeshComponent.name);
+                                }
+                                skinnedMeshComponent.rootBone = rootPrefabTransform;
+
+                                var prefabBones = new Transform[bones.Length];
+                                for (int i = 0; i < bones.Length; i++)
+                                {
+                                    var bone = bones[i];
+
+                                    var prefabTransform = GetMatchingPrefabTransform(bone, fbxAssetTransform, prefabRoot);
+                                    if (prefabTransform == null)
+                                    {
+                                        Debug.LogWarningFormat("FbxPrefabAutoUpdater: Could not find bone {0} for {1} skinned mesh", bone.name, skinnedMeshComponent.name);
+                                        continue;
+                                    }
+
+                                    prefabBones[i] = prefabTransform;
+                                }
+                                skinnedMeshComponent.bones = prefabBones;
+
+                                continue;
+                            }
                         }
                     }
                     return updatedNodes;
@@ -1407,7 +1454,7 @@ void CompareAndUpdate()
                         m_fbxPrefab.gameObject));
                 }
                 var fbxPrefabInstance = prefabInstanceRoot.GetComponentsInChildren<FbxPrefab>().FirstOrDefault(
-                    fbxPrefab => UnityEditor.PrefabUtility.GetPrefabParent(fbxPrefab) == m_fbxPrefab);
+                    fbxPrefab => UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(fbxPrefab) == m_fbxPrefab);
                 if (!fbxPrefabInstance) {
                     throw new System.Exception(string.Format("Internal error: couldn't find the right FbxPrefab after instantiating."));
                 }

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

@@ -300,8 +300,8 @@ public static UnityEditor.EditorWindow GetMainGameView()
             private static void SubscribeToEvents ()
             {
                 // ensure we only subscribe once
-                UnityEditor.EditorApplication.hierarchyWindowChanged -= UpdateLastSavedModel;
-                UnityEditor.EditorApplication.hierarchyWindowChanged += UpdateLastSavedModel;
+                UnityEditor.EditorApplication.hierarchyChanged -= UpdateLastSavedModel;
+                UnityEditor.EditorApplication.hierarchyChanged += UpdateLastSavedModel;
             }
 
             private static void UnsubscribeFromEvents ()
@@ -311,7 +311,7 @@ private static void UnsubscribeFromEvents ()
                 LastModel = null;
                 LastFilePath = null;
 
-                UnityEditor.EditorApplication.hierarchyWindowChanged -= UpdateLastSavedModel;
+                UnityEditor.EditorApplication.hierarchyChanged -= UpdateLastSavedModel;
             }
 
             private static bool AutoUpdateEnabled ()

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

@@ -1,8 +1,8 @@
 {
 "name": "com.unity.formats.fbx",
 "displayName" : "FBX Exporter",
-"version" : "1.4.0-preview",
-"dependencies" : { "com.unity.formats.fbxsdk" : "1.4.0-preview" },
+"version" : "1.5.0-preview",
+"dependencies" : { "com.unity.formats.fbxsdk" : "1.5.0-preview" },
 "unity": "2018.1",
 "description" : "The Unity FBX Exporter package makes it smooth and easy to send geometry and animation from Unity 2017.3 or later to any application that supports FBX and back again with minimal effort.\n\nIn particular, this round-trip workflow enables you to export Unity scenes to FBX, import into Maya, Maya LT, or 3ds Max using an artist-friendly interface, export Unity-ready FBX geometry and animation, and safely merge your changes back into those Assets to continue your work.\n\nThe exporter provides support for GameObject hierarchies, Materials, Textures, Cameras, Lights, Skinned Meshes, and Animation. The Unity FBX importer provides support for hierarchies, Materials, Textures, Stingray Physically Based Shader (PBS), Cameras, Animation and Animated custom properties (when present in the FBX file).\n\nThis package includes a plug-in for Autodesk Maya 2017 or later, Autodesk Maya LT 2017 or later, and 3ds Max 2017 or later.",
 "keywords" : [ "fbx", "animation", "modeling", "maya", "max" ]