Skip to content

Commit

Permalink
ResourceLoader: Print load message only when actually loading
Browse files Browse the repository at this point in the history
  • Loading branch information
RandomShaper committed Nov 25, 2024
1 parent 9e60984 commit 84f30e6
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions core/io/resource_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ Ref<Resource> 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<Resource> res;
Expand All @@ -312,7 +314,9 @@ Ref<Resource> 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_null()) {
print_verbose(vformat("Failed loading resource: %s", p_path));
} else {
return res;
}

Expand Down Expand Up @@ -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<Resource> 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;
Expand Down

0 comments on commit 84f30e6

Please sign in to comment.