Merge branch 'master' into Ut-3303-remap-prefab-to-unity-materials

Author: vkovec

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Changes in Fbx Exporter
 
-## [3.0.2-preview.1] - 2020-03-23
+## [3.0.2-preview.1] - 2020-03-19
 ### Fixed
+- Blendshapes naming in FBX so that multiple blendshapes all import correctly in Maya.
+- Don't override transforms when creating FBX Linked Prefab, so that the prefab updates properly when the FBX transforms are modified.
 - Changed FBX Linked Prefab to keep Unity materials instead of using materials exported to FBX file.
 
 ## [3.0.1-preview.2] - 2020-01-22

com.unity.formats.fbx/Editor/ConvertToNestedPrefab.cs

@@ -412,7 +412,8 @@ public static GameObject Convert(
             // replace hierarchy in the scene
             if (!isPrefabAsset && toConvert != null)
             {
-                fbxInstance.transform.parent = toConvert.transform.parent;
+                // don't worry about keeping the world position in the prefab, as we will fix the transform on the instance root
+                fbxInstance.transform.SetParent(toConvert.transform.parent, worldPositionStays: false);
                 fbxInstance.transform.SetSiblingIndex(toConvert.transform.GetSiblingIndex());
             }
 
@@ -863,10 +864,13 @@ internal static void CopyComponents(GameObject to, GameObject from, GameObject r
                     continue;
                 }
 
-                // ignore MeshFilter, but still ensure scene references are maintained
-                if (fromComponent is MeshFilter)
+                // ignore MeshFilter and Transform, but still ensure scene references are maintained.
+                // Don't need to copy regular transform (except for the root object) as the values should already be correct in the FBX.
+                // Furthermore, copying transform values may result in overrides in the prefab, which is undesired as if
+                // the transform is updated in the FBX, it won't be in the prefab.
+                if (fromComponent is MeshFilter || (fromComponent is Transform && from != root))
                 {
-                    FixSceneReferences(fromComponent, to.GetComponent<MeshFilter>(), root);
+                    FixSceneReferences(fromComponent, to.GetComponent(fromComponent.GetType()), root);
                     continue;
                 }
 

com.unity.formats.fbx/Tests/FbxTests/ConvertToModelTest.cs

@@ -435,6 +435,7 @@ public void TestStaticHelpers()
                 b2.transform.parent = b.transform; // in alpha order
                 a.AddComponent<BoxCollider> ();
                 a1.transform.localPosition = new Vector3 (1, 2, 3);
+                a.transform.localPosition = new Vector3(4, 5, 6);
 
                 Assert.AreNotEqual(b.GetComponent<MeshFilter>().sharedMesh, a.GetComponent<MeshFilter>().sharedMesh);
                 Assert.IsFalse (b.GetComponent<BoxCollider> ());
@@ -443,11 +444,12 @@ public void TestStaticHelpers()
 
                 ConvertToNestedPrefab.UpdateFromSourceRecursive (b, a);
 
-                // everything except the mesh + materials should change
+                // everything except the mesh + materials and child transforms should change
                 Assert.AreNotEqual(b.GetComponent<MeshFilter>().sharedMesh, a.GetComponent<MeshFilter>().sharedMesh);
                 Assert.IsTrue (b.GetComponent<BoxCollider> ());
                 Assert.AreEqual ("BB", b.transform.GetChild (1).name);
-                Assert.AreEqual (a1.transform.localPosition, b1.transform.localPosition);
+                Assert.AreEqual(a.transform.localPosition, b.transform.localPosition);
+                Assert.AreNotEqual (a1.transform.localPosition, b1.transform.localPosition);
             }
 
             // Test GetFbxAssetOrNull