commit auto updated code

- Unity automatically updated these functions

Author: vkovec

Assets/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs

@@ -316,7 +316,7 @@ public static GameObject ApplyOrCreatePrefab(GameObject instance,
                 string prefabFullPath = null)
             {
                 if(PrefabUtility.GetPrefabType(instance) == PrefabType.PrefabInstance) {
-                    return PrefabUtility.ReplacePrefab(instance, PrefabUtility.GetPrefabParent(instance));
+                    return PrefabUtility.ReplacePrefab(instance, PrefabUtility.GetCorrespondingObjectFromSource(instance));
                 }
 
                 // Otherwise, create a new prefab. First choose its filename/path.
@@ -388,7 +388,7 @@ public static GameObject GetFbxAssetOrNull(GameObject go) {
                 switch(unityPrefabType) {
                 case PrefabType.ModelPrefabInstance:
                     if (go.Equals(PrefabUtility.FindPrefabRoot (go))) {
-                        return PrefabUtility.GetPrefabParent(go) as GameObject;
+                        return PrefabUtility.GetCorrespondingObjectFromSource(go) as GameObject;
                     } else {
                         return null;
                     }

Assets/com.unity.formats.fbx/Editor/Scripts/FbxPrefabAutoUpdater.cs

@@ -231,7 +231,7 @@ public static bool OnValidateMenuItem()
             bool containsLinkedPrefab = false;
             foreach (GameObject selectedObject in selection)
             {
-                GameObject prefab = UnityEditor.PrefabUtility.GetPrefabParent(selectedObject) as GameObject;
+                GameObject prefab = UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(selectedObject) as GameObject;
                 if (prefab && prefab.GetComponentInChildren<FbxPrefab>())
                 {
                     containsLinkedPrefab = true;
@@ -255,7 +255,7 @@ public static void UpdateLinkedPrefab(GameObject prefabOrInstance)
                 prefab = prefabOrInstance;
                 break;
             case PrefabType.PrefabInstance:
-                prefab = PrefabUtility.GetPrefabParent(prefabOrInstance) as GameObject;
+                prefab = PrefabUtility.GetCorrespondingObjectFromSource(prefabOrInstance) as GameObject;
                 break;
             default:
                 return;
@@ -1381,7 +1381,7 @@ void CompareAndUpdate()
                         m_fbxPrefab.gameObject));
                 }
                 var fbxPrefabInstance = prefabInstanceRoot.GetComponentsInChildren<FbxPrefab>().FirstOrDefault(
-                    fbxPrefab => UnityEditor.PrefabUtility.GetPrefabParent(fbxPrefab) == m_fbxPrefab);
+                    fbxPrefab => UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(fbxPrefab) == m_fbxPrefab);
                 if (!fbxPrefabInstance) {
                     throw new System.Exception(string.Format("Internal error: couldn't find the right FbxPrefab after instantiating."));
                 }

Assets/com.unity.formats.fbx/EditorTests/ConvertToModelTest.cs

@@ -93,13 +93,13 @@ public void TestStaticHelpers()
                 var aFbx = ConvertToModel.GetOrCreateFbxAsset(a, fbxFullPath: GetRandomFbxFilePath());
                 var bFbx = ConvertToModel.GetOrCreateInstance(aFbx);
                 Assert.AreNotEqual(aFbx, bFbx);
-                Assert.AreEqual(aFbx, PrefabUtility.GetPrefabParent(bFbx));
+                Assert.AreEqual(aFbx, PrefabUtility.GetCorrespondingObjectFromSource(bFbx));
 
                 // Test on an prefab asset
                 var aPrefab = PrefabUtility.CreatePrefab(GetRandomPrefabAssetPath(), a);
                 var bPrefab = ConvertToModel.GetOrCreateInstance(aPrefab);
                 Assert.AreNotEqual(aPrefab, bPrefab);
-                Assert.AreEqual(aPrefab, PrefabUtility.GetPrefabParent(bPrefab));
+                Assert.AreEqual(aPrefab, PrefabUtility.GetCorrespondingObjectFromSource(bPrefab));
             }
 
             // Test SetupFbxPrefab
@@ -122,13 +122,13 @@ public void TestStaticHelpers()
 
                 var aPath = GetRandomPrefabAssetPath();
                 var aPrefab = ConvertToModel.ApplyOrCreatePrefab(a, prefabFullPath: aPath);
-                Assert.AreEqual(aPrefab, PrefabUtility.GetPrefabParent(a));
+                Assert.AreEqual(aPrefab, PrefabUtility.GetCorrespondingObjectFromSource(a));
 
                 // Now apply it again (replacing aPrefab). Make sure we use the
                 // same file rather than creating a new one.
                 var bPath = GetRandomPrefabAssetPath();
                 var bPrefab = ConvertToModel.ApplyOrCreatePrefab(a, prefabFullPath: bPath);
-                Assert.AreEqual(bPrefab, PrefabUtility.GetPrefabParent(a));
+                Assert.AreEqual(bPrefab, PrefabUtility.GetCorrespondingObjectFromSource(a));
                 Assert.AreEqual(aPath, AssetDatabase.GetAssetPath(bPrefab));
             }
 
@@ -227,7 +227,7 @@ public void BasicTest()
             Assert.That(cube); // we kept the original
             Assert.That(cubePrefab); // we got the new
             Assert.AreEqual("Cube", cubePrefab.name); // it has the right name
-            Assert.AreSame(PrefabUtility.GetPrefabParent(cube), cubePrefab); // the original and new are the same
+            Assert.AreSame(PrefabUtility.GetCorrespondingObjectFromSource(cube), cubePrefab); // the original and new are the same
             Assert.That(!EditorUtility.IsPersistent(cube));
             Assert.That(EditorUtility.IsPersistent(cubePrefab));
 
@@ -265,7 +265,7 @@ public void ExhaustiveTests() {
             {
                 var a = CreateHierarchy();
                 var aConvert = ConvertToModel.Convert(a, fbxFullPath: GetRandomFbxFilePath(), prefabFullPath: GetRandomPrefabAssetPath());
-                Assert.AreEqual(aConvert, PrefabUtility.GetPrefabParent(a));
+                Assert.AreEqual(aConvert, PrefabUtility.GetCorrespondingObjectFromSource(a));
             }
 
             // Test Convert on a prefab asset.
@@ -295,7 +295,7 @@ public void ExhaustiveTests() {
                 var aPrefab = PrefabUtility.CreatePrefab(aPrefabPath, a);
                 var bPrefabPath = GetRandomPrefabAssetPath();
                 var aConvert = ConvertToModel.Convert(a, fbxFullPath: GetRandomFbxFilePath(), prefabFullPath: bPrefabPath);
-                Assert.AreEqual(aConvert, PrefabUtility.GetPrefabParent(a));
+                Assert.AreEqual(aConvert, PrefabUtility.GetCorrespondingObjectFromSource(a));
                 Assert.AreEqual(bPrefabPath, AssetDatabase.GetAssetPath(aConvert));
                 Assert.AreEqual(aPrefabPath, AssetDatabase.GetAssetPath(aPrefab));
                 Assert.AreNotEqual(aPrefabPath, AssetDatabase.GetAssetPath(aConvert));
@@ -437,7 +437,7 @@ public void TestInstanceNameMatchesFilename()
 
             Assert.That (cube);
             Assert.That (cubePrefab);
-            Assert.AreSame (cubePrefab, PrefabUtility.GetPrefabParent(cube));
+            Assert.AreSame (cubePrefab, PrefabUtility.GetCorrespondingObjectFromSource(cube));
 
             Assert.AreEqual (Path.GetFileNameWithoutExtension (path), cube.name);
         }
@@ -476,7 +476,7 @@ public void TestConvertModelInstance()
             GameObject converted = ConvertToModel.Convert (fbxInstance,
                     fbxFullPath: GetRandomFbxFilePath(),
                     prefabFullPath: GetRandomPrefabAssetPath());
-            Assert.That (converted, Is.EqualTo (PrefabUtility.GetPrefabParent(fbxInstance)));
+            Assert.That (converted, Is.EqualTo (PrefabUtility.GetCorrespondingObjectFromSource(fbxInstance)));
 
             // check meshes link to original fbx
             var prefabCubeMesh = fbxInstance.GetComponent<MeshFilter>().sharedMesh;