Merge pull request #2375 from StephenHodgson/MRTK-vNEXT-ManagerCleanupAfterInspectorChange

Config Profile Inspector doesn't update values after change.

Author: David Kline

Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityCameraProfileInspector.cs

@@ -20,12 +20,12 @@ public class MixedRealityCameraProfileInspector : MixedRealityBaseConfigurationP
         private SerializedProperty transparentBackgroundColor;
         private SerializedProperty holoLensQualityLevel;
 
-        private GUIContent nearClipTitle = new GUIContent("Near Clip");
-        private GUIContent clearFlagsTitle = new GUIContent("Clear Flags");
+        private readonly GUIContent nearClipTitle = new GUIContent("Near Clip");
+        private readonly GUIContent clearFlagsTitle = new GUIContent("Clear Flags");
 
         private void OnEnable()
         {
-            if (!CheckMixedRealityManager())
+            if (!CheckMixedRealityManager(false))
             {
                 return;
             }

Assets/MixedRealityToolkit/_Core/Inspectors/MixedRealityConfigurationProfileInspector.cs

@@ -25,6 +25,8 @@ public class MixedRealityConfigurationProfileInspector : MixedRealityBaseConfigu
         private SerializedProperty controllersProfile;
         private SerializedProperty enableBoundarySystem;
 
+        private MixedRealityConfigurationProfile configurationProfile;
+
         private void OnEnable()
         {
             // Create The MR Manager if none exists.
@@ -55,6 +57,7 @@ private void OnEnable()
                 }
             }
 
+            configurationProfile = target as MixedRealityConfigurationProfile;
             enableCameraProfile = serializedObject.FindProperty("enableCameraProfile");
             cameraProfile = serializedObject.FindProperty("cameraProfile");
             enableInputSystem = serializedObject.FindProperty("enableInputSystem");
@@ -74,6 +77,7 @@ public override void OnInspectorGUI()
 
             var previousLabelWidth = EditorGUIUtility.labelWidth;
             EditorGUIUtility.labelWidth = 160f;
+            EditorGUI.BeginChangeCheck();
 
             // Camera Profile Configuration
             EditorGUILayout.LabelField("Camera Settings", EditorStyles.boldLabel);
@@ -117,6 +121,11 @@ public override void OnInspectorGUI()
 
             EditorGUIUtility.labelWidth = previousLabelWidth;
             serializedObject.ApplyModifiedProperties();
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                MixedRealityManager.Instance.ResetConfiguration(configurationProfile);
+            }
         }
 
         private static void RenderProfile(SerializedProperty property)