godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72257 from KoBeWi/potential_fix_or_maybe_not_who_knows 

Fix sub-resource IDs resetting when preloaded
This commit is contained in:
Rémi Verschelde 2023-02-07 16:30:06 +01:00
parent 98921d8fba 095c805079
commit 07d46da485
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/resource_format_text.cpp
View File

@ -601,9 +601,11 @@ Error ResourceLoaderText::load() {
*progress = resource_current / float(resources_total); *progress = resource_current / float(resources_total);
} }
int_resources[id] = res; //always assign int resources int_resources[id] = res; // Always assign int resources.
if (do_assign && cache_mode != ResourceFormatLoader::CACHE_MODE_IGNORE) { if (do_assign) {
res->set_path(path, cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE); if (cache_mode != ResourceFormatLoader::CACHE_MODE_IGNORE) {
res->set_path(path, cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE);
}
res->set_scene_unique_id(id); res->set_scene_unique_id(id);
} }