Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-20471-write-to-temp-file-when-exporting

# Conflicts:
#	Assets/FbxExporters/Editor/FbxExporter.cs

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -287,21 +287,31 @@ private static void CopyComponents(GameObject from, GameObject to){
                     if (success) {
                         // if to already has this component, then copy the values over
                         var toComponent = to.GetComponent (components [i].GetType ());
-                        if (toComponent != null) {
-                            // don't want to copy MeshFilter because then we will replace the
-                            // exported mesh with the old mesh
-                            if (!(toComponent is MeshFilter)) {
-                                if (toComponent is SkinnedMeshRenderer) {
-                                    var skinnedMesh = toComponent as SkinnedMeshRenderer;
-                                    var sharedMesh = skinnedMesh.sharedMesh;
-                                    success = UnityEditorInternal.ComponentUtility.PasteComponentValues (toComponent);
-                                    skinnedMesh.sharedMesh = sharedMesh;
-                                } else {
-                                    success = UnityEditorInternal.ComponentUtility.PasteComponentValues (toComponent);
-                                }
-                            }
-                        } else {
+                        if (toComponent == null) {
                             success = UnityEditorInternal.ComponentUtility.PasteComponentAsNew (to);
+                        } else{
+                            // Don't want to copy MeshFilter because then we will replace the
+                            // exported mesh with the old mesh.
+                            if (toComponent is MeshFilter) {
+                                continue;
+                            }
+                            // Don't want to copy materials over either in case the materials are
+                            // embedded in another model.
+                            else if (toComponent is SkinnedMeshRenderer) {
+                                var skinnedMesh = toComponent as SkinnedMeshRenderer;
+                                var sharedMesh = skinnedMesh.sharedMesh;
+                                var sharedMats = skinnedMesh.sharedMaterials;
+                                success = UnityEditorInternal.ComponentUtility.PasteComponentValues (toComponent);
+                                skinnedMesh.sharedMesh = sharedMesh;
+                                skinnedMesh.sharedMaterials = sharedMats;
+                            } else if (toComponent is Renderer) {
+                                var renderer = toComponent as Renderer;
+                                var sharedMats = renderer.sharedMaterials;
+                                success = UnityEditorInternal.ComponentUtility.PasteComponentValues (toComponent);
+                                renderer.sharedMaterials = sharedMats;
+                            } else {
+                                success = UnityEditorInternal.ComponentUtility.PasteComponentValues (toComponent);
+                            }
                         }
                     }
                     if (!success) {