Somehow my prefab replacement didn't stick. Reverted

Stephen Hodgson · Stephen Hodgson · commit 59dc1b5df55b · 2017-10-04T17:52:43.000-07:00
diff --git a/Assets/HoloToolkit/Utilities/Scripts/Editor/SceneSettingsWindow.cs b/Assets/HoloToolkit/Utilities/Scripts/Editor/SceneSettingsWindow.cs
@@ -33,7 +33,8 @@ protected override void ApplySettings()
         {
             if (Values[SceneSetting.AddMixedRealityCamera])
             {
-                Instantiate(AssetDatabase.LoadAssetAtPath<GameObject>(AssetDatabase.GUIDToAssetPath(CameraPrefabGUID)));
+                DestroyImmediate(Camera.main.gameObject);
+                PrefabUtility.InstantiatePrefab(AssetDatabase.LoadAssetAtPath<GameObject>(AssetDatabase.GUIDToAssetPath(CameraPrefabGUID)));
             }
 
             var mainCamera = CameraCache.Refresh(Camera.main);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ protected override void ApplySettings()`
`33`	`33`	`{`
`34`	`34`	`if (Values[SceneSetting.AddMixedRealityCamera])`
`35`	`35`	`{`
`36`		`- Instantiate(AssetDatabase.LoadAssetAtPath<GameObject>(AssetDatabase.GUIDToAssetPath(CameraPrefabGUID)));`
	`36`	`+ DestroyImmediate(Camera.main.gameObject);`
	`37`	`+ PrefabUtility.InstantiatePrefab(AssetDatabase.LoadAssetAtPath<GameObject>(AssetDatabase.GUIDToAssetPath(CameraPrefabGUID)));`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`var mainCamera = CameraCache.Refresh(Camera.main);`