From 6740823e405ba40b4287ddb7cf8552fb0bd27f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Mon, 25 Nov 2024 09:54:20 +0100 Subject: [PATCH] ResourceLoader: Print load message only when actually loading --- core/io/resource_loader.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 1615f145db2..33b1b115a50 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -294,6 +294,8 @@ Ref ResourceLoader::_load(const String &p_path, const String &p_origin } load_paths_stack.push_back(original_path); + print_verbose(vformat("Loading resource: %s", p_path)); + // Try all loaders and pick the first match for the type hint bool found = false; Ref res; @@ -303,7 +305,7 @@ Ref ResourceLoader::_load(const String &p_path, const String &p_origin } 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()) { + if (res.is_valid()) { break; } } @@ -312,8 +314,10 @@ Ref ResourceLoader::_load(const String &p_path, const String &p_origin res_ref_overrides.erase(load_nesting); load_nesting--; - if (!res.is_null()) { + if (res.is_valid()) { return res; + } else { + print_verbose(vformat("Failed loading resource: %s", p_path)); } ERR_FAIL_COND_V_MSG(found, Ref(), @@ -361,18 +365,12 @@ void ResourceLoader::_run_load_task(void *p_userdata) { bool xl_remapped = false; const String &remapped_path = _path_remap(load_task.local_path, &xl_remapped); - print_verbose("Loading resource: " + remapped_path); - Error load_err = OK; Ref res = _load(remapped_path, remapped_path != load_task.local_path ? load_task.local_path : String(), load_task.type_hint, load_task.cache_mode, &load_err, load_task.use_sub_threads, &load_task.progress); if (MessageQueue::get_singleton() != MessageQueue::get_main_singleton()) { MessageQueue::get_singleton()->flush(); } - if (res.is_null()) { - print_verbose("Failed loading resource: " + remapped_path); - } - thread_load_mutex.lock(); load_task.resource = res;