godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Push p_original_path into load_paths_stack and sub_tasks instead of p_path.

Browse Source 
(cherry picked from commit 7565d1f3ab)
This commit is contained in:
Matthew Edwards 2024-01-29 17:27:57 +00:00 committed by Rémi Verschelde
parent f4106e5fb3
commit 5cc432e7a1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/resource_loader.cpp
View File

@ -244,11 +244,11 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
thread_load_mutex.lock();
HashMap<String, ThreadLoadTask>::Iterator E = thread_load_tasks.find(load_paths_stack->get(load_paths_stack->size() - 1));
if (E) {
E->value.sub_tasks.insert(p_path);
E->value.sub_tasks.insert(p_original_path);
}
thread_load_mutex.unlock();
}
load_paths_stack->push_back(p_path);
load_paths_stack->push_back(p_original_path);
// Try all loaders and pick the first match for the type hint
bool found = false;