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

Revert "Push p_original_path into load_paths_stack and sub_tasks instead of p_path."

Browse Source 
This reverts commit 5cc432e7a1.
This commit is contained in:
Rémi Verschelde
2024-04-05 15:22:17 +02:00
parent e423ace94e
commit 63f45cd75d
1 changed files with 2 additions and 2 deletions
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(); thread_load_mutex.lock();
HashMap<String, ThreadLoadTask>::Iterator E = thread_load_tasks.find(load_paths_stack->get(load_paths_stack->size() - 1)); HashMap<String, ThreadLoadTask>::Iterator E = thread_load_tasks.find(load_paths_stack->get(load_paths_stack->size() - 1));
if (E) { if (E) {
E->value.sub_tasks.insert(p_original_path); E->value.sub_tasks.insert(p_path);
} }
thread_load_mutex.unlock(); thread_load_mutex.unlock();
} }
load_paths_stack->push_back(p_original_path); load_paths_stack->push_back(p_path);
// Try all loaders and pick the first match for the type hint // Try all loaders and pick the first match for the type hint
bool found = false; bool found = false;