diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-19 23:44:51 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-20 00:36:28 +0300 |
| commit | 59cfb20fa112e636a6ae85cb6fdc048f16af5637 (patch) | |
| tree | 9c432021924b4e5e7667cb2639648dcfded561c9 /source/blender/blenkernel | |
| parent | 8d63d7337cec3b2dea06b3a520af467d9fc3e66d (diff) | |
Fix PBVH parallel range not initializing user data correctly in some cases
This was already changed for the TBB-based BLI_task_parallel_range in master.
This task local storage should always be initialized from the template, not
copied from another task which may be executing at the time the copy happens.
This may not fix any actual bug, we only use this user data for parallel reduce
and it's not clear that TBB ever calls the copy constructor for that case.
Ref T76858
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh_parallel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_parallel.cc b/source/blender/blenkernel/intern/pbvh_parallel.cc index 2534fdea3ee..adacbd13b61 100644 --- a/source/blender/blenkernel/intern/pbvh_parallel.cc +++ b/source/blender/blenkernel/intern/pbvh_parallel.cc @@ -49,7 +49,7 @@ struct PBVHTask { PBVHTask(const PBVHTask &other) : func(other.func), userdata(other.userdata), settings(other.settings) { - init_chunk(other.userdata_chunk); + init_chunk(settings->userdata_chunk); } /* Splitting constructor for parallel reduce. */ |