asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #81026 from Razoric480/raz/use_resource_cache

Browse source 
[3.x] Make binary resource loader utilize loaded external resources
This commit is contained in:
Rémi Verschelde 2023-08-28 14:49:13 +02:00 committed by GitHub
commit 47e64671f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/io/resource_format_binary.cpp
View file

@ -339,7 +339,18 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) {
path = ProjectSettings::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path)); path = ProjectSettings::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
} }
RES res = ResourceLoader::load(path, exttype, no_subresource_cache); RES res;
for (List<RES>::Element *E = resource_cache.front(); E; E = E->next()) {
if (E->get()->get_path() == path) {
res = E->get();
break;
}
}
if (res.is_null()) {
res = ResourceLoader::load(path, exttype, no_subresource_cache);
}
if (res.is_null()) { if (res.is_null()) {
WARN_PRINT(String("Couldn't load resource: " + path).utf8().get_data()); WARN_PRINT(String("Couldn't load resource: " + path).utf8().get_data());