From af6d260c178c4879d0eb11212bb7163408eb468e Mon Sep 17 00:00:00 2001 From: "Yevhen Babiichuk (DustDFG)" Date: Wed, 16 Oct 2024 14:13:36 +0300 Subject: Don't include `core/io/image.h` in `core/os/os.h` `core/os/os.h` doesn't use `core/io/image.h`. It just brings transitive dependencies. Lots of dependencies because `core/os/os.h` is transitively included in almost every file of godot Also added `core/io/image.h` into files^1 where `Ref` and `core/os/os.h` were used to prevent obscure errors involving `Ref` ^1 except those which include `core/io/image_loader.h` or `core/io/image.h` by corresponding .h file with the same name Signed-off-by: Yevhen Babiichuk (DustDFG) Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com> --- editor/debugger/editor_profiler.cpp | 1 + editor/debugger/editor_visual_profiler.cpp | 1 + editor/editor_node.cpp | 1 + editor/plugins/editor_preview_plugins.cpp | 1 + 4 files changed, 4 insertions(+) (limited to 'editor') diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp index d244b6b4cd..8b253f36e4 100644 --- a/editor/debugger/editor_profiler.cpp +++ b/editor/debugger/editor_profiler.cpp @@ -30,6 +30,7 @@ #include "editor_profiler.h" +#include "core/io/image.h" #include "core/os/os.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp index 7b831a1c8b..b949df4518 100644 --- a/editor/debugger/editor_visual_profiler.cpp +++ b/editor/debugger/editor_visual_profiler.cpp @@ -30,6 +30,7 @@ #include "editor_visual_profiler.h" +#include "core/io/image.h" #include "core/os/os.h" #include "editor/editor_settings.h" #include "editor/editor_string_names.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index dd6c88ef25..f328b9fc91 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -35,6 +35,7 @@ #include "core/input/input.h" #include "core/io/config_file.h" #include "core/io/file_access.h" +#include "core/io/image.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/object/class_db.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index 9a53f07a3f..3618c0e6d3 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -32,6 +32,7 @@ #include "core/config/project_settings.h" #include "core/io/file_access_memory.h" +#include "core/io/image.h" #include "core/io/resource_loader.h" #include "core/object/script_language.h" #include "core/os/os.h" -- cgit v1.2.3