diff options
| author | Ignacio Etcheverry | 2018-05-27 17:15:41 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-06-01 17:33:51 +0200 |
| commit | 94b4bb2a12cfc53a644eccda48e411e3accef2c6 (patch) | |
| tree | 5f08db99605bf1b543e874b46edca46284f5f292 | |
| parent | 188bfd2ac95a697f216e964bd020e2a076ea1a11 (diff) | |
| download | godot-94b4bb2a12cfc53a644eccda48e411e3accef2c6.tar.gz godot-94b4bb2a12cfc53a644eccda48e411e3accef2c6.tar.zst godot-94b4bb2a12cfc53a644eccda48e411e3accef2c6.zip | |
Mono: Fix MonoImage filename being set to an invalid path
(cherry picked from commit 97fb999976ce7d86d4bbe881716f12c45d138c51)
| -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 d062d56dc..9d3bee217 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; |