Merge pull request #504 from Unity-Technologies/v3.0.0-preview

V3.0.0 preview

Author: vkovec

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changes in Fbx Exporter
 
+## [3.0.2-preview.1] - 2020-03-25
+### Fixed
+- Blendshapes naming in FBX so that multiple blendshapes all import correctly in Maya. Thank you to @lazlo-bonin for the fix.
+- 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.
+- Fix issue where Maya imports root bone as null object if it doesn't have any descendants that are also bones.
+
 ## [3.0.1-preview.2] - 2020-01-22
 ### Added
 - Added option to export geometry when recording with the FBX recorder (in previous version geometry was always exported).

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;
                 }
 
@@ -930,27 +934,16 @@ internal static void CopyComponents(GameObject to, GameObject from, GameObject r
                 }
 
                 FixSceneReferences(fromComponent, toComponent, root);
-
-                // Do not try to copy materials for ParticleSystemRenderer, since it is not in the
-                // FBX file
-                if (fromComponent is Renderer && !(fromComponent is ParticleSystemRenderer))
-                {
-                    var renderer = toComponent as Renderer;
-                    var sharedMaterials = renderer.sharedMaterials;
-                    EditorJsonUtility.FromJsonOverwrite(json, toComponent);
-                    renderer.sharedMaterials = sharedMaterials;
-                }
-                // SkinnedMeshRenderer stores both the mesh and materials.
-                // Make sure these do not get copied over when the SkinnedMeshRenderer is updated.
-                else if (fromComponent is SkinnedMeshRenderer)
+                
+                // SkinnedMeshRenderer also stores the mesh.
+                // Make sure this is not copied over when the SkinnedMeshRenderer is updated,
+                // as we want to keep the mesh from the FBX not the scene.
+                if (fromComponent is SkinnedMeshRenderer)
                 {
                     var skinnedMesh = toComponent as SkinnedMeshRenderer;
                     var mesh = skinnedMesh.sharedMesh;
-                    var materials = skinnedMesh.sharedMaterials;
                     EditorJsonUtility.FromJsonOverwrite(json, toComponent);
-                    var toSkinnedMesh = toComponent as SkinnedMeshRenderer;
-                    toSkinnedMesh.sharedMesh = mesh;
-                    toSkinnedMesh.sharedMaterials = materials;
+                    skinnedMesh.sharedMesh = mesh;
                 }
                 else
                 {

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

@@ -498,7 +498,14 @@ private bool ExportBlendShapes(MeshInfo mesh, FbxMesh fbxMesh, FbxScene fbxScene
                     var weight = umesh.GetBlendShapeFrameWeight(bi, fi);
                     umesh.GetBlendShapeFrameVertices(bi, fi, deltaPoints, deltaNormals, deltaTangents);
 
-                    var fbxShape = FbxShape.Create(fbxScene, "");
+                    var fbxShapeName = bsName;
+
+                    if (numFrames > 1)
+                    {
+                        fbxShapeName += "_" + fi;
+                    }
+
+                    var fbxShape = FbxShape.Create(fbxScene, fbxShapeName);
                     fbxChannel.AddTargetShape(fbxShape, weight);
 
                     // control points
@@ -2842,8 +2849,28 @@ private bool ExportBoneTransform(
                 fbxSkeleton.Size.Set (1.0f * UnitScaleFactor);
                 fbxNode.SetNodeAttribute (fbxSkeleton);
             }
-            var fbxSkeletonType = rootBone != unityBone
-                ? FbxSkeleton.EType.eLimbNode : FbxSkeleton.EType.eRoot;
+            var fbxSkeletonType = FbxSkeleton.EType.eLimbNode;
+
+            // Only set the rootbone's skeleton type to FbxSkeleton.EType.eRoot
+            // if it has at least one child that is also a bone.
+            // Otherwise if it is marked as Root but has no bones underneath,
+            // Maya will import it as a Null object instead of a bone.
+            if (rootBone == unityBone && rootBone.childCount > 0)
+            {
+                var hasChildBone = false;
+                foreach (Transform child in unityBone)
+                {
+                    if (boneDict.ContainsKey(child))
+                    {
+                        hasChildBone = true;
+                        break;
+                    }
+                }
+                if (hasChildBone)
+                {
+                    fbxSkeletonType = FbxSkeleton.EType.eRoot;
+                }
+            }
             fbxSkeleton.SetSkeletonType (fbxSkeletonType);
 
             var bindPoses = skinnedMesh.sharedMesh.bindposes;

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

@@ -107,15 +107,17 @@ protected void AssertSameMeshesAndMaterials(GameObject expectedHierarchy, GameOb
             {
                 Assert.That(actualSkinnedMesh);
                 Assert.That(expectedSkinnedMesh.sharedMesh, Is.EqualTo(actualSkinnedMesh.sharedMesh));
-                Assert.That(expectedSkinnedMesh.sharedMaterial, Is.EqualTo(actualSkinnedMesh.sharedMaterial));
+                // material should not equal what is in the FBX, but what was originally in the scene
+                Assert.That(expectedSkinnedMesh.sharedMaterial, Is.Not.EqualTo(actualSkinnedMesh.sharedMaterial));
             }
 
             var expectedRenderer = expectedHierarchy.GetComponent<Renderer>();
             var actualRenderer = actualHierarchy.GetComponent<Renderer>();
             if (expectedRenderer)
             {
                 Assert.That(actualRenderer);
-                Assert.That(expectedRenderer.sharedMaterial, Is.EqualTo(actualRenderer.sharedMaterial));
+                // material should not equal what is in the FBX, but what was originally in the scene
+                Assert.That(expectedRenderer.sharedMaterial, Is.Not.EqualTo(actualRenderer.sharedMaterial));
             }
 
             var expectedTransform = expectedHierarchy.transform;
@@ -433,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> ());
@@ -441,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

com.unity.formats.fbx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.unity.formats.fbx",
   "displayName": "FBX Exporter",
-  "version": "3.0.1-preview.2",
+  "version": "3.0.2-preview.1",
   "dependencies": {
     "com.unity.recorder": "2.1.0-preview.1",
     "com.unity.timeline": "1.0.0",