diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-29 19:31:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 19:31:59 +0200 |
| commit | ba3734e69a2f2a4f6c4f908958268762fd805cd2 (patch) | |
| tree | 8c87cd1864f49ae49fb08a3e0c8c6d114fa27069 /modules | |
| parent | 74d92bf459758404cf48a7ae0249b381613bfab1 (diff) | |
| parent | ac870ab1c8a41f8867b76ca66c364d284fea5488 (diff) | |
Merge pull request #63603 from aaronfranke/editor-paths
Move editor paths into the EditorPaths class
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdscript/gdscript.cpp | 4 | ||||
| -rw-r--r-- | modules/mono/editor/editor_internal_calls.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 4a3dbce2b9..28722bd178 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -51,7 +51,7 @@ #endif #ifdef TOOLS_ENABLED -#include "editor/editor_settings.h" +#include "editor/editor_paths.h" #endif /////////////////////////// @@ -848,7 +848,7 @@ Error GDScript::reload(bool p_keep_state) { // Loading a template, don't parse. #ifdef TOOLS_ENABLED - if (EditorSettings::get_singleton() && basedir.begins_with(EditorSettings::get_singleton()->get_project_script_templates_dir())) { + if (EditorPaths::get_singleton() && basedir.begins_with(EditorPaths::get_singleton()->get_project_script_templates_dir())) { return OK; } #endif diff --git a/modules/mono/editor/editor_internal_calls.cpp b/modules/mono/editor/editor_internal_calls.cpp index 5e4fe90553..8b1b44852f 100644 --- a/modules/mono/editor/editor_internal_calls.cpp +++ b/modules/mono/editor/editor_internal_calls.cpp @@ -189,7 +189,7 @@ MonoString *godot_icall_Internal_UpdateApiAssembliesFromPrebuilt(MonoString *p_c } MonoString *godot_icall_Internal_FullExportTemplatesDir() { - String full_templates_dir = EditorSettings::get_singleton()->get_export_templates_dir().plus_file(VERSION_FULL_CONFIG); + String full_templates_dir = EditorPaths::get_singleton()->get_export_templates_dir().plus_file(VERSION_FULL_CONFIG); return GDMonoMarshal::mono_string_from_godot(full_templates_dir); } |