diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-06 22:38:07 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-06 22:38:07 +0200 |
| commit | c9dc1eb1d59bf67bb123ed1ac5f9e0cfb93e275b (patch) | |
| tree | 89d049834d6231d3454f165abb90d89ceae101c4 | |
| parent | 05d985496c73577fb0b44291345da5f2dbe09844 (diff) | |
| parent | 97197ff5e9c73ffbb2e3822d40a63bc3f8c47373 (diff) | |
| download | redot-engine-c9dc1eb1d59bf67bb123ed1ac5f9e0cfb93e275b.tar.gz | |
Merge pull request #96656 from RandomShaper/res_changed_multiverse_fixups
ResourceLoader: Fixup resource changed feature
| -rw-r--r-- | core/io/resource_loader.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index a083a91a63..4201bfe785 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -818,6 +818,8 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro load_task_ptr = &load_task; } + p_thread_load_lock.temp_unlock(); + Ref<Resource> resource = load_task_ptr->resource; if (r_error) { *r_error = load_task_ptr->error; @@ -855,6 +857,8 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro } } + p_thread_load_lock.temp_relock(); + return resource; } |