summaryrefslogtreecommitdiff
path: root/core/io
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-08-12 12:44:38 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-08-12 12:44:38 +0200
commitd29ea4337fd165423b3b8ae0e88b18ce89f6dd9a (patch)
tree7a42a60b567550b2c0e252addfee8c0a8f75ad2d /core/io
parent64595f0f6ad2aab38fb14f85c077c6e147326624 (diff)
Fix ResourceLoader::exists() false negative and readd deprecated has()
Diffstat (limited to 'core/io')
-rw-r--r--core/io/resource_loader.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index ab2d18eb1b..8b0655deb0 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -126,6 +126,7 @@ Ref<ResourceInteractiveLoader> ResourceFormatLoader::load_interactive(const Stri
bool ResourceFormatLoader::exists(const String &p_path) const {
return FileAccess::exists(p_path); //by default just check file
}
+
RES ResourceFormatLoader::load(const String &p_path, const String &p_original_path, Error *r_error) {
String path = p_path;
@@ -252,7 +253,7 @@ bool ResourceLoader::exists(const String &p_path, const String &p_type_hint) {
if (ResourceCache::has(local_path)) {
- return false; //if cached, it probably exists i guess
+ return true; // If cached, it probably exists
}
bool xl_remapped = false;