Merge pull request #9679 from keveleigh/editor-recreate

Don't constantly recreate the base profile editor

Author: keveleigh

Assets/MRTK/Core/Inspectors/MixedRealityToolkitInspector.cs

@@ -11,6 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Editor
     public class MixedRealityToolkitInspector : UnityEditor.Editor
     {
         private SerializedProperty activeProfile;
+        private UnityEditor.Editor activeProfileEditor;
 
         private void OnEnable()
         {
@@ -33,7 +34,7 @@ public override void OnInspectorGUI()
                 {
                     if (GUILayout.Button("Select Active Instance"))
                     {
-                        UnityEditor.Selection.activeGameObject = MixedRealityToolkit.Instance.gameObject;
+                        Selection.activeGameObject = MixedRealityToolkit.Instance.gameObject;
                     }
 
                     if (GUILayout.Button("Make this the Active Instance"))
@@ -46,7 +47,7 @@ public override void OnInspectorGUI()
 
             serializedObject.Update();
 
-            // If not profile is assigned, then warn user
+            // If no profile is assigned, then warn user
             if (activeProfile.objectReferenceValue == null)
             {
                 EditorGUILayout.HelpBox("MixedRealityToolkit cannot initialize unless an Active Profile is assigned!", MessageType.Error);
@@ -59,12 +60,17 @@ public override void OnInspectorGUI()
             if (changed)
             {
                 MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);
+                activeProfileEditor = null;
             }
 
-            if (activeProfile.objectReferenceValue != null)
+            if (activeProfile.objectReferenceValue != null && activeProfileEditor == null)
+            {
+                // For the configuration profile, show the default inspector GUI
+                activeProfileEditor = CreateEditor(activeProfile.objectReferenceValue);
+            }
+
+            if (activeProfileEditor != null)
             {
-                // For configure, show the default inspector GUI
-                UnityEditor.Editor activeProfileEditor = CreateEditor(activeProfile.objectReferenceValue);
                 activeProfileEditor.OnInspectorGUI();
             }
         }