use Unity materials instead of FBX materials in Linked Prefab

Author: vkovec

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

@@ -930,27 +930,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)
+                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;
                 }
                 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;