Moved layer states out of editor prefs

Author: Chman

PostProcessing/Editor/PostProcessLayerEditor.cs

@@ -37,6 +37,9 @@ public sealed class PostProcessLayerEditor : BaseEditor<PostProcessLayer>
         SerializedProperty m_DebugMonitor;
         SerializedProperty m_DebugLightMeter;
 
+        SerializedProperty m_ShowToolkit;
+        SerializedProperty m_ShowCustomSorter;
+
         Dictionary<PostProcessEvent, ReorderableList> m_CustomLists;
 
         static GUIContent[] s_AntialiasingMethodNames =
@@ -80,6 +83,9 @@ void OnEnable()
             m_DebugMonitor = FindProperty(x => x.debugView.monitor);
             m_DebugLightMeter = FindProperty(x => x.debugView.lightMeter);
 
+            m_ShowToolkit = serializedObject.FindProperty("m_ShowToolkit");
+            m_ShowCustomSorter = serializedObject.FindProperty("m_ShowCustomSorter");
+
             // In case of domain reload, if the inspector is opened on a disabled PostProcessLayer
             // component it won't go through its OnEnable() and thus will miss bundle initialization
             // so force it there - also for some reason, an editor's OnEnable() can be called before
@@ -279,9 +285,9 @@ void DoDebugLayer()
         void DoToolkit()
         {
             EditorUtilities.DrawSplitter();
-            GlobalSettings.showLayerToolkit = EditorUtilities.DrawHeader("Toolkit", GlobalSettings.showLayerToolkit);
+            m_ShowToolkit.boolValue = EditorUtilities.DrawHeader("Toolkit", m_ShowToolkit.boolValue);
 
-            if (GlobalSettings.showLayerToolkit)
+            if (m_ShowToolkit.boolValue)
             {
                 GUILayout.Space(2);
 
@@ -328,9 +334,9 @@ void DoToolkit()
         void DoCustomEffectSorter()
         {
             EditorUtilities.DrawSplitter();
-            GlobalSettings.showCustomSorter = EditorUtilities.DrawHeader("Custom Effect Sorting", GlobalSettings.showCustomSorter);
+            m_ShowCustomSorter.boolValue = EditorUtilities.DrawHeader("Custom Effect Sorting", m_ShowCustomSorter.boolValue);
 
-            if (GlobalSettings.showCustomSorter)
+            if (m_ShowCustomSorter.boolValue)
             {
                 GUILayout.Space(5);
 

PostProcessing/Editor/Utils/GlobalSettings.cs

@@ -11,8 +11,6 @@ static class Keys
             internal const string volumeGizmoColor     = "PostProcessing.Volume.GizmoColor";
             internal const string currentChannelMixer  = "PostProcessing.ChannelMixer.CurrentChannel";
             internal const string currentCurve         = "PostProcessing.Curve.Current";
-            internal const string showLayerToolkit     = "PostProcessing.Layer.showLayerToolkit";
-            internal const string showCustomSorter     = "PostProcessing.Layer.ShowCustomSorter";
         }
 
         static bool m_Loaded = false;
@@ -45,20 +43,6 @@ internal static int currentCurve
             set { TrySave(ref m_CurrentCurve, value, Keys.currentCurve); }
         }
 
-        static bool m_ShowCustomSorter = false;
-        internal static bool showCustomSorter
-        {
-            get { return m_ShowCustomSorter; }
-            set { TrySave(ref m_ShowCustomSorter, value, Keys.showCustomSorter); }
-        }
-
-        static bool m_ShowLayerToolkit = false;
-        internal static bool showLayerToolkit
-        {
-            get { return m_ShowLayerToolkit; }
-            set { TrySave(ref m_ShowLayerToolkit, value, Keys.showLayerToolkit); }
-        }
-
         static GlobalSettings()
         {
             Load();
@@ -82,8 +66,6 @@ static void Load()
             m_VolumeGizmoColor     = GetColor(Keys.volumeGizmoColor, new Color(0.2f, 0.8f, 0.1f, 0.5f));
             m_CurrentChannelMixer  = EditorPrefs.GetInt(Keys.currentChannelMixer, 0);
             m_CurrentCurve         = EditorPrefs.GetInt(Keys.currentCurve, 0);
-            m_ShowLayerToolkit     = EditorPrefs.GetBool(Keys.showLayerToolkit, false);
-            m_ShowCustomSorter     = EditorPrefs.GetBool(Keys.showCustomSorter, false);
 
             m_Loaded = true;
         }

PostProcessing/Runtime/PostProcessLayer.cs

@@ -39,6 +39,13 @@ public enum Antialiasing
         [SerializeField]
         PostProcessResources m_Resources;
 
+        // UI states
+        [SerializeField]
+        bool m_ShowToolkit;
+
+        [SerializeField]
+        bool m_ShowCustomSorter;
+
         // Will stop applying post-processing effects just before color grading is applied
         // Currently used to export to exr without color grading
         public bool breakBeforeColorGrading = false;