diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-03-02 11:26:54 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-03-02 11:26:54 +0100 |
| commit | 4fceabc30caea1ccdf82e5d3c1a780812dee88c7 (patch) | |
| tree | d0a4d46e9c314efa752f9af73edc2196bc80dcdc /core/io/resource_loader.cpp | |
| parent | f339f8e3d2537ce78845b47e023af5e082621b3f (diff) | |
| parent | c51229491d9fe5cba7e4a51821d10dcef7986e1a (diff) | |
| download | redot-engine-4fceabc30caea1ccdf82e5d3c1a780812dee88c7.tar.gz | |
Merge pull request #73862 from RandomShaper/fix_subthreaded_res_load
Lift restriction that resource load thread requester has to be the initiator
Diffstat (limited to 'core/io/resource_loader.cpp')
| -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 c47f297a72..77b5e5b66d 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(); |