Merge pull request #99 from Unity-Technologies/UNI-22870-convert-to-prefab-incorrect-scene

benoithudson · web-flow · commit 56a40721f9d8 · 2017-08-24T10:26:12.000-04:00
UNI-22870 Convert to Prefab: make sure the prefab gets imported into the right scene
diff --git a/Assets/FbxExporters/Editor/ConvertToModel.cs b/Assets/FbxExporters/Editor/ConvertToModel.cs
@@ -132,7 +132,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
                     }
 
                     // Instantiate the FBX file.
-                    Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);
+                    Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset, gosToExport[i].scene);
                     GameObject unityGO = unityObj as GameObject;
                     if (!unityGO) {
                         continue;

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`// Instantiate the FBX file.`
`135`		`- Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);`
	`135`	`+ Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset, gosToExport[i].scene);`
`136`	`136`	`GameObject unityGO = unityObj as GameObject;`
`137`	`137`	`if (!unityGO) {`
`138`	`138`	`continue;`