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

Merge pull request #64298 from Razoric480/raz/bin-cache

Browse source 
Fix binary resource internal cache not being filled at polling time
This commit is contained in:
Rémi Verschelde 2022-08-29 07:04:31 +02:00 • committed by GitHub
commit a21221d70c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/io/resource_format_binary.cpp
View file

@ -315,7 +315,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) {
path = remaps[path]; path = remaps[path];
} }
RES res = ResourceLoader::load(path, exttype, no_subresource_cache); RES res = ResourceLoader::load(path, exttype, false);
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());
@ -608,7 +608,7 @@ Error ResourceInteractiveLoaderBinary::poll() {
if (remaps.has(path)) { if (remaps.has(path)) {
path = remaps[path]; path = remaps[path];
} }
RES res = ResourceLoader::load(path, external_resources[s].type, no_subresource_cache); RES res = ResourceLoader::load(path, external_resources[s].type, false);
if (res.is_null()) { if (res.is_null()) {
if (!ResourceLoader::get_abort_on_missing_resources()) { if (!ResourceLoader::get_abort_on_missing_resources()) {
ResourceLoader::notify_dependency_error(local_path, path, external_resources[s].type); ResourceLoader::notify_dependency_error(local_path, path, external_resources[s].type);
@ -711,6 +711,7 @@ Error ResourceInteractiveLoaderBinary::poll() {
#endif #endif
stage++; stage++;
internal_resources_cache[subindex] = res;
resource_cache.push_back(res); resource_cache.push_back(res);
if (main) { if (main) {

2
scene/resources/resource_format_text.cpp
View file

@ -403,7 +403,7 @@ Error ResourceInteractiveLoaderText::poll() {
path = remaps[path]; path = remaps[path];
} }
RES res = ResourceLoader::load(path, type, no_subresource_cache); RES res = ResourceLoader::load(path, type, false);
if (res.is_null()) { if (res.is_null()) {
if (ResourceLoader::get_abort_on_missing_resources()) { if (ResourceLoader::get_abort_on_missing_resources()) {