Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-03 01:19:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ported: Fix binary internal cache not being filled

Browse Source 
- Razoric480
d331e5c7ac
This commit is contained in:
Relintai 2023-08-30 13:00:40 +02:00
parent 4a51324f7d
commit 7e270262f9
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

@ -380,7 +380,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());
@ -724,7 +724,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);
@ -827,6 +827,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()) {