Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #96656 from RandomShaper/res_changed_multiverse_fixups

Browse Source 
ResourceLoader: Fixup resource changed feature
This commit is contained in:
Rémi Verschelde 2024-09-06 22:38:07 +02:00
commit c9dc1eb1d5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/resource_loader.cpp
View File

@ -818,6 +818,8 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
load_task_ptr = &load_task; load_task_ptr = &load_task;
} }
p_thread_load_lock.temp_unlock();
Ref<Resource> resource = load_task_ptr->resource; Ref<Resource> resource = load_task_ptr->resource;
if (r_error) { if (r_error) {
*r_error = load_task_ptr->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; return resource;
} }