Merge pull request #75 from Unity-Technologies/UNI-22870-convert-to-model-saves-to-wrong-scene

vkovec · web-flow · commit ddfc69e9be35 · 2017-08-04T15:16:06.000-04:00
UNI-22870 Convert to Model doesnt save to correct scene if muliple scenes open
diff --git a/Assets/FbxExporters/Editor/ConvertToModel.cs b/Assets/FbxExporters/Editor/ConvertToModel.cs
@@ -133,7 +133,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam
                     Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath("Assets/" + relativePath);
 
                     if (unityMainAsset != null) {
-                        Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);
+                        Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset, gosToExport[i].scene);
                         GameObject unityGO = unityObj as GameObject;
                         if (unityGO != null) 
                         {

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (GameObject [] unityGam`
`133`	`133`	`Object unityMainAsset = AssetDatabase.LoadMainAssetAtPath("Assets/" + relativePath);`
`134`	`134`
`135`	`135`	`if (unityMainAsset != null) {`
`136`		`- Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset);`
	`136`	`+ Object unityObj = PrefabUtility.InstantiatePrefab (unityMainAsset, gosToExport[i].scene);`
`137`	`137`	`GameObject unityGO = unityObj as GameObject;`
`138`	`138`	`if (unityGO != null)`
`139`	`139`	`{`