Merge pull request #383 from Unity-Technologies/feature/making-experimental-as-user-prefs

Making experimental feature as a User Pref that can be reset

Author: lopezt-unity

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changes
 
+- Property `Experimental Feature` can now be reset with the rest of ProBuilder preferences.
 - Add `GameObject/ProBuilder` menu to create primitives with default dimensions.
 
 ## [5.0.2] - 2021-03-11

Editor/EditorCore/Experimental.cs

@@ -7,6 +7,9 @@ static class Experimental
     {
         const string k_ExperimentalFeaturesEnabled = "PROBUILDER_EXPERIMENTAL_FEATURES";
 
+        [UserSetting]
+        static Pref<bool> s_experimentalFeatureEnabled = new Pref<bool>("experimental.enabled", false, SettingsScope.Project);
+
         [UserSetting]
         static Pref<bool> s_MeshesAreAssets = new Pref<bool>("experimental.meshesAreAssets", false, SettingsScope.Project);
 
@@ -24,25 +27,35 @@ internal static bool experimentalFeaturesEnabled
 #endif
         }
 
+        static Experimental()
+        {
+            if(s_experimentalFeatureEnabled.value != experimentalFeaturesEnabled)
+            {
+                s_experimentalFeatureEnabled.value = experimentalFeaturesEnabled;
+                ProBuilderSettings.Save();
+            }
+        }
+
+        public static void AfterSettingsSaved()
+        {
+#if PROBUILDER_EXPERIMENTAL_FEATURES
+            if(!s_experimentalFeatureEnabled.value)
+                ScriptingSymbolManager.RemoveScriptingDefine(k_ExperimentalFeaturesEnabled);
+#else
+            if(s_experimentalFeatureEnabled.value)
+                ScriptingSymbolManager.AddScriptingDefine(k_ExperimentalFeaturesEnabled);
+#endif
+        }
+
         [UserSettingBlock("Experimental")]
         static void ExperimentalFeaturesSettings(string searchContext)
         {
             var enabled = experimentalFeaturesEnabled;
 
-            EditorGUI.BeginChangeCheck();
-
             EditorGUILayout.HelpBox("Enabling Experimental Features will cause Unity to recompile scripts.", MessageType.Warning);
-            enabled = SettingsGUILayout.SearchableToggle("Experimental Features Enabled", enabled, searchContext);
-
-            if (EditorGUI.EndChangeCheck())
-            {
-                if(enabled)
-                    ScriptingSymbolManager.AddScriptingDefine(k_ExperimentalFeaturesEnabled);
-                else
-                    ScriptingSymbolManager.RemoveScriptingDefine(k_ExperimentalFeaturesEnabled);
-            }
+            s_experimentalFeatureEnabled.value = SettingsGUILayout.SearchableToggle("Experimental Features Enabled", enabled, searchContext);
 
-            if(enabled)
+            if(s_experimentalFeatureEnabled.value)
             {
                 using (new SettingsGUILayout.IndentedGroup())
                 {

Editor/EditorCore/ProBuilderSettingsProvider.cs

@@ -19,6 +19,7 @@ static SettingsProvider CreateSettingsProvider()
             {
                 if(ProBuilderEditor.instance != null)
                     ProBuilderEditor.ReloadSettings();
+                Experimental.AfterSettingsSaved();
             };
 
             return provider;