From 5cc432e7a13730a10e4b09b51dd72598c1b3ac8e Mon Sep 17 00:00:00 2001 From: Matthew Edwards Date: Mon, 29 Jan 2024 17:27:57 +0000 Subject: [PATCH] Push p_original_path into load_paths_stack and sub_tasks instead of p_path. (cherry picked from commit 7565d1f3abb592a5978613701a4b9b744df748da) --- core/io/resource_loader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 0214adbe40f..6b91cb0c8fa 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -244,11 +244,11 @@ Ref ResourceLoader::_load(const String &p_path, const String &p_origin thread_load_mutex.lock(); HashMap::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;