Merge pull request #503 from Unity-Technologies/Ut-3303-remap-prefab-to-unity-materials

UT-3303 use Unity materials instead of FBX materials in Linked Prefab

Author: vkovec

CHANGELOG.md

@@ -4,6 +4,7 @@
 ### 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
 ### Added

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

@@ -934,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/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;