diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2018-05-27 17:19:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-27 17:19:13 +0200 |
| commit | 97342e69856d0f5d15523cfdd13edaeefeb4c823 (patch) | |
| tree | 3d46e2b6704ecff003b86d58104fe973dfaacf32 | |
| parent | 6c649bd785b0901b0fcba37673f5256626d3f92d (diff) | |
| parent | 97fb999976ce7d86d4bbe881716f12c45d138c51 (diff) | |
Merge pull request #19201 from neikeq/issue-13837
Mono: Fix MonoImage filename being set to an invalid path
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_assembly.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index d062d56dcf..9d3bee2176 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -33,9 +33,10 @@ #include <mono/metadata/mono-debug.h> #include <mono/metadata/tokentype.h> -#include "list.h" -#include "os/file_access.h" -#include "os/os.h" +#include "core/list.h" +#include "core/os/file_access.h" +#include "core/os/os.h" +#include "core/project_settings.h" #include "../godotsharp_dirs.h" #include "gd_mono_class.h" @@ -210,7 +211,7 @@ Error GDMonoAssembly::load(bool p_refonly) { Vector<uint8_t> data = FileAccess::get_file_as_array(path); ERR_FAIL_COND_V(data.empty(), ERR_FILE_CANT_READ); - String image_filename(path); + String image_filename = ProjectSettings::get_singleton()->globalize_path(path); MonoImageOpenStatus status = MONO_IMAGE_OK; |