godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 2a1403cf62 d331e5c7ac
commit a21221d70c
2 changed files with 4 additions and 3 deletions
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];
}
RES res = ResourceLoader::load(path, exttype, no_subresource_cache);
RES res = ResourceLoader::load(path, exttype, false);
if (res.is_null()) {
WARN_PRINT(String("Couldn't load resource: " + path).utf8().get_data());
@@ -608,7 +608,7 @@ Error ResourceInteractiveLoaderBinary::poll() {
if (remaps.has(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 (!ResourceLoader::get_abort_on_missing_resources()) {
ResourceLoader::notify_dependency_error(local_path, path, external_resources[s].type);
@@ -711,6 +711,7 @@ Error ResourceInteractiveLoaderBinary::poll() {
#endif
stage++;
internal_resources_cache[subindex] = res;
resource_cache.push_back(res);
if (main) {