diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2023-02-24 08:45:21 +0100 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-04-24 14:04:18 +0200 |
| commit | a37eb88c5b8086e32f46e780cce75c5c94f3b175 (patch) | |
| tree | 14fab139c1ae4ddd341dd444285bf3a6f3fdd8ec /core | |
| parent | 90b4ca2e506c6a0d432770d59f62ae7eea565ad0 (diff) | |
Lift restriction that resource load thread requester has to be the initiator
(cherry picked from commit c51229491d9fe5cba7e4a51821d10dcef7986e1a)
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/resource_loader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index d0448e86fc..a46fac4e7a 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -310,12 +310,6 @@ Error ResourceLoader::load_threaded_request(const String &p_path, const String & thread_load_mutex->unlock(); ERR_FAIL_V_MSG(ERR_INVALID_PARAMETER, "There is no thread loading source resource '" + p_source_resource + "'."); } - //must be loading from this thread - if (thread_load_tasks[p_source_resource].loader_id != Thread::get_caller_id()) { - thread_load_mutex->unlock(); - ERR_FAIL_V_MSG(ERR_INVALID_PARAMETER, "Threading loading resource'" + local_path + " failed: Source specified: '" + p_source_resource + "' but was not called by it."); - } - //must not be already added as s sub tasks if (thread_load_tasks[p_source_resource].sub_tasks.has(local_path)) { thread_load_mutex->unlock(); |