Merge pull request #32 from Unity-Technologies/UNI-21408-prefab-link-broken-bug

inwoods · web-flow · commit ce44e093b31c · 2017-07-13T11:59:39.000-04:00
UNI-21408 fix so that the prefab link is not broken
diff --git a/Assets/FbxExporters/Editor/ConvertToModel.cs b/Assets/FbxExporters/Editor/ConvertToModel.cs
@@ -112,7 +112,7 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)
                     Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath (fbxFileName);
 
                     if (unityMainAsset != null) {
-                        Object unityObj = PrefabUtility.InstantiateAttachedAsset (unityMainAsset);
+                        Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);
                         GameObject unityGO = unityObj as GameObject;
                         if (unityGO != null) 
                         {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private static List<GameObject> OnConvertInPlace (GameObject [] unityActiveGOs)`
`112`	`112`	`Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath (fbxFileName);`
`113`	`113`
`114`	`114`	`if (unityMainAsset != null) {`
`115`		`- Object unityObj = PrefabUtility.InstantiateAttachedAsset (unityMainAsset);`
	`115`	`+ Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);`
`116`	`116`	`GameObject unityGO = unityObj as GameObject;`
`117`	`117`	`if (unityGO != null)`
`118`	`118`	`{`