From d331e5c7ac4865e9d023ebfbba1bc6473d0ecec6 Mon Sep 17 00:00:00 2001 From: Francois Belair Date: Thu, 11 Aug 2022 22:33:21 -0400 Subject: [PATCH] Fix binary internal cache not being filled --- core/io/resource_format_binary.cpp | 5 +++-- scene/resources/resource_format_text.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 6cf26d51f82..ba97ae4931e 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -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) { diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index 87d4b42c2a2..1667ed8a21a 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -403,7 +403,7 @@ Error ResourceInteractiveLoaderText::poll() { path = remaps[path]; } - RES res = ResourceLoader::load(path, type, no_subresource_cache); + RES res = ResourceLoader::load(path, type, false); if (res.is_null()) { if (ResourceLoader::get_abort_on_missing_resources()) {