From 9410031d4568e9515f8ea7e067c3bdecc5880eda Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Fri, 2 Feb 2024 15:04:19 -0500 Subject: [PATCH] Fix upstream EditorScale header locations Due to upstream change: https://github.com/godotengine/godot/commit/4b55c81ebae48c53e88654a42c04365391b6159d --- editor/action_banner.cpp | 2 +- editor/blackboard_plan_editor.cpp | 2 +- editor/debugger/behavior_tree_view.cpp | 2 +- editor/debugger/limbo_debugger_plugin.cpp | 2 +- editor/limbo_ai_editor_plugin.cpp | 2 +- editor/task_palette.cpp | 2 +- editor/task_tree.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/editor/action_banner.cpp b/editor/action_banner.cpp index b3764a1..c779e1c 100644 --- a/editor/action_banner.cpp +++ b/editor/action_banner.cpp @@ -17,7 +17,7 @@ #include "../util/limbo_string_names.h" #ifdef LIMBOAI_MODULE -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/button.h" #endif // LIMBOAI_MODULE diff --git a/editor/blackboard_plan_editor.cpp b/editor/blackboard_plan_editor.cpp index 82333d2..9ae3f2b 100644 --- a/editor/blackboard_plan_editor.cpp +++ b/editor/blackboard_plan_editor.cpp @@ -19,7 +19,7 @@ #ifdef LIMBOAI_MODULE #include "editor/editor_interface.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/line_edit.h" #include "scene/gui/panel_container.h" #include "scene/resources/style_box_flat.h" diff --git a/editor/debugger/behavior_tree_view.cpp b/editor/debugger/behavior_tree_view.cpp index 9520e74..11cba93 100644 --- a/editor/debugger/behavior_tree_view.cpp +++ b/editor/debugger/behavior_tree_view.cpp @@ -24,7 +24,7 @@ #include "core/object/callable_method_pointer.h" #include "core/os/time.h" #include "core/typedefs.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "editor/editor_settings.h" #include "scene/resources/style_box.h" #endif // LIMBOAI_MODULE diff --git a/editor/debugger/limbo_debugger_plugin.cpp b/editor/debugger/limbo_debugger_plugin.cpp index 762b78b..697796f 100644 --- a/editor/debugger/limbo_debugger_plugin.cpp +++ b/editor/debugger/limbo_debugger_plugin.cpp @@ -31,9 +31,9 @@ #include "core/variant/array.h" #include "editor/editor_interface.h" #include "editor/editor_paths.h" -#include "editor/editor_scale.h" #include "editor/filesystem_dock.h" #include "editor/plugins/editor_debugger_plugin.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/box_container.h" #include "scene/gui/control.h" #include "scene/gui/item_list.h" diff --git a/editor/limbo_ai_editor_plugin.cpp b/editor/limbo_ai_editor_plugin.cpp index 467af76..1b7e16e 100644 --- a/editor/limbo_ai_editor_plugin.cpp +++ b/editor/limbo_ai_editor_plugin.cpp @@ -35,13 +35,13 @@ #include "editor/editor_file_system.h" #include "editor/editor_help.h" #include "editor/editor_paths.h" -#include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "editor/editor_undo_redo_manager.h" #include "editor/filesystem_dock.h" #include "editor/inspector_dock.h" #include "editor/plugins/script_editor_plugin.h" #include "editor/project_settings_editor.h" +#include "editor/themes/editor_scale.h" #include "scene/gui/panel_container.h" #include "scene/gui/separator.h" #endif // LIMBOAI_MODULE diff --git a/editor/task_palette.cpp b/editor/task_palette.cpp index 8067b25..1987322 100644 --- a/editor/task_palette.cpp +++ b/editor/task_palette.cpp @@ -24,7 +24,7 @@ #include "editor/editor_help.h" #include "editor/editor_node.h" #include "editor/editor_paths.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #include "editor/plugins/script_editor_plugin.h" #include "scene/gui/check_box.h" #endif // LIMBO_MODULE diff --git a/editor/task_tree.cpp b/editor/task_tree.cpp index d28297b..cbd857c 100644 --- a/editor/task_tree.cpp +++ b/editor/task_tree.cpp @@ -20,7 +20,7 @@ #ifdef LIMBOAI_MODULE #include "core/object/script_language.h" -#include "editor/editor_scale.h" +#include "editor/themes/editor_scale.h" #endif // LIMBOAI_MODULE #ifdef LIMBOAI_GDEXTENSION