diff options
| author | Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com> | 2024-10-16 14:13:36 +0300 |
|---|---|---|
| committer | Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com> | 2024-10-18 19:04:19 +0300 |
| commit | af6d260c178c4879d0eb11212bb7163408eb468e (patch) | |
| tree | 36ad6b662e3be37dddd9bbeed79850e38fb8882d /core | |
| parent | 4631a617e5ab4ec5cc51dbc43609b269a43059d9 (diff) | |
| download | redot-engine-af6d260c178c4879d0eb11212bb7163408eb468e.tar.gz | |
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<Image>` and `core/os/os.h`
were used to prevent obscure errors involving `Ref<Image>`
^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) <dfgdust@gmail.com>
Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/core_bind.h | 1 | ||||
| -rw-r--r-- | core/extension/gdextension_interface.cpp | 1 | ||||
| -rw-r--r-- | core/os/os.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/core/core_bind.h b/core/core_bind.h index ce0bde3c05..d59a2c55f1 100644 --- a/core/core_bind.h +++ b/core/core_bind.h @@ -32,7 +32,6 @@ #define CORE_BIND_H #include "core/debugger/engine_profiler.h" -#include "core/io/image.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" #include "core/object/script_language.h" diff --git a/core/extension/gdextension_interface.cpp b/core/extension/gdextension_interface.cpp index 66b0161160..91f0b4a2de 100644 --- a/core/extension/gdextension_interface.cpp +++ b/core/extension/gdextension_interface.cpp @@ -34,6 +34,7 @@ #include "core/extension/gdextension.h" #include "core/extension/gdextension_compat_hashes.h" #include "core/io/file_access.h" +#include "core/io/image.h" #include "core/io/xml_parser.h" #include "core/object/class_db.h" #include "core/object/script_language_extension.h" diff --git a/core/os/os.h b/core/os/os.h index 30d2a4266f..c42a39e0a4 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -32,7 +32,6 @@ #define OS_H #include "core/config/engine.h" -#include "core/io/image.h" #include "core/io/logger.h" #include "core/io/remote_filesystem_client.h" #include "core/os/time_enums.h" |