From 219b14b9057fd6eb61b494a4df4676b49a4bf131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 20 Nov 2024 16:50:30 +0100 Subject: [PATCH] Revert "ResourceLoader: Report error if resource type unrecognized" This reverts commit fe21913ee82c9e3fd660b511f618fce40cf43e49. --- core/io/resource_loader.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index ecd0a91aa4c..1615f145db2 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -295,13 +295,13 @@ Ref ResourceLoader::_load(const String &p_path, const String &p_origin load_paths_stack.push_back(original_path); // Try all loaders and pick the first match for the type hint - bool loader_found = false; + bool found = false; Ref res; for (int i = 0; i < loader_count; i++) { if (!loader[i]->recognize_path(p_path, p_type_hint)) { continue; } - loader_found = true; + found = true; res = loader[i]->load(p_path, original_path, r_error, p_use_sub_threads, r_progress, p_cache_mode); if (!res.is_null()) { break; @@ -316,24 +316,15 @@ Ref ResourceLoader::_load(const String &p_path, const String &p_origin return res; } - if (!loader_found) { - if (r_error) { - *r_error = ERR_FILE_UNRECOGNIZED; - } - ERR_FAIL_V_MSG(Ref(), vformat("No loader found for resource: %s (expected type: %s)", p_path, p_type_hint)); - } + ERR_FAIL_COND_V_MSG(found, Ref(), + vformat("Failed loading resource: %s. Make sure resources have been imported by opening the project in the editor at least once.", p_path)); #ifdef TOOLS_ENABLED Ref file_check = FileAccess::create(FileAccess::ACCESS_RESOURCES); - if (!file_check->file_exists(p_path)) { - if (r_error) { - *r_error = ERR_FILE_NOT_FOUND; - } - ERR_FAIL_V_MSG(Ref(), vformat("Resource file not found: %s (expected type: %s)", p_path, p_type_hint)); - } + ERR_FAIL_COND_V_MSG(!file_check->file_exists(p_path), Ref(), vformat("Resource file not found: %s (expected type: %s)", p_path, p_type_hint)); #endif - ERR_FAIL_V_MSG(Ref(), vformat("Failed loading resource: %s. Make sure resources have been imported by opening the project in the editor at least once.", p_path)); + ERR_FAIL_V_MSG(Ref(), vformat("No loader found for resource: %s (expected type: %s)", p_path, p_type_hint)); } // This implementation must allow re-entrancy for a task that started awaiting in a deeper stack frame.