summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorSaracenOne <SaracenOne@gmail.com>2021-08-10 05:42:35 +0100
committerSaracenOne <SaracenOne@gmail.com>2021-08-10 05:42:35 +0100
commitd00c151db1ce7cba4f87e387ecccb4ef7362c0cb (patch)
treecd11dcfe0aa98f159a4e5d49221589c49bdfa30d /scene/resources
parentf3ddc14d3829ed09d6eab81811bcfb1314626ddf (diff)
Assign embedded text resource path earlier to prevent error on embedded scripts.
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/resource_format_text.cpp12
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);
}