summaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-02-28 10:32:49 +0100
committerGitHub <noreply@github.com>2021-02-28 10:32:49 +0100
commit8faecd6a470aeef41084a32d74f4a131a5ef42b6 (patch)
tree987c65261da313365ffda6bcf8b744850ede8435 /core/io
parent3326cb02aa8e9bf14935bdbbaddbca9ef440acc0 (diff)
parent472673b38d2f670d1478f852d20268ce81646a02 (diff)
Merge pull request #46499 from kuruk-mm/fix_cache_load
ResourceLoader: Fix inverse 'if' on the cache mode
Diffstat (limited to 'core/io')
-rw-r--r--core/io/resource_loader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index cba9a47187..8275dd0ad4 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -518,7 +518,7 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, Resour
local_path = ProjectSettings::get_singleton()->localize_path(p_path);
}
- if (p_cache_mode == ResourceFormatLoader::CACHE_MODE_IGNORE) {
+ if (p_cache_mode != ResourceFormatLoader::CACHE_MODE_IGNORE) {
thread_load_mutex->lock();
//Is it already being loaded? poll until done