Merge pull request #142 from Unity-Technologies/uni-25528-prefab-duplicate

UNI-25528; handle Convert-to-prefab on an FbxPrefab.

Author: benoithudson

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -173,7 +173,12 @@ public static GameObject Convert (
                 SetupImportedGameObject (toConvert, unityGO);
 
                 // Set up the FbxPrefab component so it will auto-update.
-                var fbxPrefab = unityGO.AddComponent<FbxPrefab>();
+                // Make sure to delete whatever FbxPrefab history we had.
+                var fbxPrefab = unityGO.GetComponent<FbxPrefab>();
+                if (fbxPrefab) {
+                    Object.DestroyImmediate(fbxPrefab);
+                }
+                fbxPrefab = unityGO.AddComponent<FbxPrefab>();
                 fbxPrefab.SetSourceModel(unityMainAsset);
 
                 // Disconnect from the FBX file.

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -165,6 +165,11 @@ public void BasicTest()
             var assetFullPath = Path.GetFullPath(Path.Combine(Application.dataPath,
                 "../" + assetRelativePath));
             Assert.AreEqual(Path.GetFullPath(path), Path.GetDirectoryName(assetFullPath));
+
+            // Convert it again, make sure there's only one FbxPrefab (see UNI-25528).
+            var cubePrefabInstance2 = ConvertToModel.Convert(cubePrefabInstance,
+                    directoryFullPath: path, keepOriginal: false);
+            Assert.That(cubePrefabInstance2.GetComponents<FbxPrefab>().Length, Is.EqualTo(1));
         }
     }
 }