Experience Settings profile can now be set to None, fixed 2020 issue with cloning profiles (#9982)

* Experience Settings profile can now be set to None

* caching the old profile to detect if a change has occured

Author: RogPodge

Assets/MRTK/Core/Inspectors/MixedRealityToolkitInspector.cs

@@ -12,10 +12,12 @@ public class MixedRealityToolkitInspector : UnityEditor.Editor
     {
         private SerializedProperty activeProfile;
         private UnityEditor.Editor activeProfileEditor;
+        private Object cachedProfile;
 
         private void OnEnable()
         {
             activeProfile = serializedObject.FindProperty("activeProfile");
+            cachedProfile = activeProfile.objectReferenceValue;
         }
 
         public override void OnInspectorGUI()
@@ -53,14 +55,16 @@ public override void OnInspectorGUI()
                 EditorGUILayout.HelpBox("MixedRealityToolkit cannot initialize unless an Active Profile is assigned!", MessageType.Error);
             }
 
-            bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false);
+            bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false) ||
+                cachedProfile != activeProfile.objectReferenceValue;
 
             serializedObject.ApplyModifiedProperties();
 
             if (changed)
             {
                 MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);
                 activeProfileEditor = null;
+                cachedProfile = activeProfile.objectReferenceValue;
             }
 
             if (activeProfile.objectReferenceValue != null && activeProfileEditor == null)

Assets/MRTK/Core/Inspectors/Profiles/MixedRealityToolkitConfigurationProfileInspector.cs

@@ -21,7 +21,6 @@ public class MixedRealityToolkitConfigurationProfileInspector : BaseMixedReality
         private static readonly GUIContent TargetScaleContent = new GUIContent("Target Scale:");
 
         // Experience properties
-        private SerializedProperty experienceSettingsType;
         private SerializedProperty experienceSettingsProfile;
 
         // Tracking the old experience scale property for compatibility
@@ -97,7 +96,6 @@ protected override void OnEnable()
             MixedRealityToolkitConfigurationProfile mrtkConfigProfile = target as MixedRealityToolkitConfigurationProfile;
 
             // Experience configuration
-            experienceSettingsType = serializedObject.FindProperty("experienceSettingsType");
             experienceSettingsProfile = serializedObject.FindProperty("experienceSettingsProfile");
             experienceScaleMigration = serializedObject.FindProperty("targetExperienceScale");
 
@@ -160,7 +158,7 @@ protected override void OnEnable()
                                 oldExperienceSettingsScale = oldExperienceSettingsProfile.TargetExperienceScale;
                             }
 
-                            changed |= RenderProfile(experienceSettingsProfile, typeof(MixedRealityExperienceSettingsProfile), true, false,  null, true);
+                            changed |= RenderProfile(experienceSettingsProfile, typeof(MixedRealityExperienceSettingsProfile), true, false,  null);
 
                             // Experience configuration
                             if (mrtkConfigProfile.ExperienceSettingsProfile != null)
@@ -258,14 +256,24 @@ protected override void OnEnable()
                         return changed;
                     },
                     () => {
-                        var experienceScale = mrtkConfigProfile.ExperienceSettingsProfile.TargetExperienceScale;
-                        if (experienceScale != ExperienceScale.Room)
+                        if(mrtkConfigProfile.ExperienceSettingsProfile.IsNull())
                         {
-                            // Alert the user if the experience scale does not support boundary features.
+                            // Alert that an experience settings profile has not been selected
                             GUILayout.Space(6f);
-                            EditorGUILayout.HelpBox("Boundaries are only supported in Room scale experiences.", MessageType.Warning);
+                            EditorGUILayout.HelpBox("Boundaries require an experience settings profile with a Room scale target experience scale.", MessageType.Warning);
                             GUILayout.Space(6f);
                         }
+                        else
+                        {
+                            var experienceScale = mrtkConfigProfile.ExperienceSettingsProfile.TargetExperienceScale;
+                            if (experienceScale != ExperienceScale.Room)
+                            {
+                                // Alert the user if the experience scale does not support boundary features.
+                                GUILayout.Space(6f);
+                                EditorGUILayout.HelpBox("Boundaries are only supported in Room scale experiences.", MessageType.Warning);
+                                GUILayout.Space(6f);
+                            }
+                        }
 
                         bool changed = false;
                         using (var c = new EditorGUI.ChangeCheckScope())