Conditional CustomEditor override

MaiKuraki · Sep 8, 2024 · 89c51b9 · 89c51b9
1 parent e1d3b74
commit 89c51b9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Assets/Editor Toolbox/Editor/ToolboxDefines.cs b/Assets/Editor Toolbox/Editor/ToolboxDefines.cs
@@ -3,5 +3,6 @@
     internal static class ToolboxDefines
     {
         internal const string defaultListsDefine = "TOOLBOX_FORCE_DEFAULT_LISTS";
+        internal const string ignoreEditorDefine = "TOOLBOX_IGNORE_CUSTOM_EDITOR";
     }
 }
diff --git a/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs b/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs
@@ -246,7 +246,10 @@ internal static void UpdateDrawers(IToolboxInspectorSettings settings)
             //create all type-only-related drawers
             PrepareTargetTypeDrawers(settings);
 
-            HandleDefaultLists(settings.ForceDefaultLists);
+            var useDefaultLists = settings.ForceDefaultLists;
+            HandleDefaultLists(useDefaultLists);
+            var ignoreCustomEditor = !settings.UseToolboxDrawers;
+            HandleIgnoreEditor(ignoreCustomEditor);
             //log errors into console only once
             validationEnabled = false;
         }
@@ -301,6 +304,18 @@ internal static void HandleDefaultLists(bool value)
             }
         }
 
+        internal static void HandleIgnoreEditor(bool value)
+        {
+            if (value)
+            {
+                ScriptingUtility.AppendDefine(ToolboxDefines.ignoreEditorDefine);
+            }
+            else
+            {
+                ScriptingUtility.RemoveDefine(ToolboxDefines.ignoreEditorDefine);
+            }
+        }
+
         internal static ToolboxDecoratorDrawerBase GetDecoratorDrawer<T>(T attribute) where T : ToolboxDecoratorAttribute
         {
             return GetDecoratorDrawer(attribute.GetType());

diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditor.cs b/Assets/Editor Toolbox/Editor/ToolboxEditor.cs
@@ -9,7 +9,9 @@ namespace Toolbox.Editor
     /// <summary>
     /// Base Editor class for all Toolbox-related features.
     /// </summary>
+#if !TOOLBOX_IGNORE_CUSTOM_EDITOR
     [CustomEditor(typeof(Object), true, isFallback = true)]
+#endif
     [CanEditMultipleObjects]
     public class ToolboxEditor : Editor, IToolboxEditor
     {