diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-05-20 01:46:15 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-20 01:46:15 +0300 |
commit | 33fc42bd6523c0cd45091e4690e7605604ec4a12 (patch) | |
tree | 9240dcb6c05e858d26520361c6f3ac9df5ee6798 /source/blender/blenlib/intern/task_range.cc | |
parent | 5ca8875f69d3b3644ca30882428608773fcc4481 (diff) | |
parent | 499c0229f7e5a3bee0c2292fc58f3c7bbaf23240 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenlib/intern/task_range.cc')
-rw-r--r-- | source/blender/blenlib/intern/task_range.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/task_range.cc b/source/blender/blenlib/intern/task_range.cc index 55de35f0060..da38c8fd352 100644 --- a/source/blender/blenlib/intern/task_range.cc +++ b/source/blender/blenlib/intern/task_range.cc @@ -115,6 +115,8 @@ void BLI_task_parallel_range(const int start, #ifdef WITH_TBB /* Multithreading. */ if (settings->use_threading && BLI_task_scheduler_num_threads() > 1) { + BLI_threaded_malloc_begin(); + RangeTask task(func, userdata, settings); const size_t grainsize = MAX2(settings->min_iter_per_thread, 1); const tbb::blocked_range<int> range(start, stop, grainsize); @@ -129,6 +131,7 @@ void BLI_task_parallel_range(const int start, parallel_for(range, task); } + BLI_threaded_malloc_end(); return; } #endif |