diff options
author | SaracenOne <SaracenOne@gmail.com> | 2021-08-10 05:42:35 +0100 |
---|---|---|
committer | SaracenOne <SaracenOne@gmail.com> | 2021-08-10 05:42:35 +0100 |
commit | d00c151db1ce7cba4f87e387ecccb4ef7362c0cb (patch) | |
tree | cd11dcfe0aa98f159a4e5d49221589c49bdfa30d /scene | |
parent | f3ddc14d3829ed09d6eab81811bcfb1314626ddf (diff) |
Assign embedded text resource path earlier to prevent error on embedded scripts.
Diffstat (limited to 'scene')
-rw-r--r-- | scene/resources/resource_format_text.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index 2b93414906..dbe118a262 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -558,6 +558,12 @@ Error ResourceLoaderText::load() { resource_current++; + int_resources[id] = res; //always assign int resources + if (do_assign && cache_mode != ResourceFormatLoader::CACHE_MODE_IGNORE) { + res->set_path(path, cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE); + res->set_scene_unique_id(id); + } + while (true) { String assign; Variant value; @@ -585,12 +591,6 @@ Error ResourceLoaderText::load() { } } - int_resources[id] = res; //always assign int resources - if (do_assign && cache_mode != ResourceFormatLoader::CACHE_MODE_IGNORE) { - res->set_path(path, cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE); - res->set_scene_unique_id(id); - } - if (progress && resources_total > 0) { *progress = resource_current / float(resources_total); } |