[Bf-blender-cvs] [33fc42bd652] master: Merge branch 'blender-v2.83-release'

[Brecht Van Lommel]

Commit: 33fc42bd6523c0cd45091e4690e7605604ec4a12
Author: Brecht Van Lommel
Date:   Wed May 20 00:46:15 2020 +0200
Branches: master
https://developer.blender.org/rB33fc42bd6523c0cd45091e4690e7605604ec4a12

Merge branch 'blender-v2.83-release'

===================================================================



===================================================================

diff --cc source/blender/blenlib/intern/task_range.cc
index 55de35f0060,aced73ec817..da38c8fd352
--- a/source/blender/blenlib/intern/task_range.cc
+++ b/source/blender/blenlib/intern/task_range.cc
@@@ -114,21 -120,22 +114,24 @@@ void BLI_task_parallel_range(const int 
  {
  #ifdef WITH_TBB
    /* Multithreading. */
 -  if (settings->use_threading) {
 +  if (settings->use_threading && BLI_task_scheduler_num_threads() > 1) {
+     BLI_threaded_malloc_begin();
+ 
 -    PBVHTask task(func, userdata, settings);
 +    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);
  
      if (settings->func_reduce) {
 -      parallel_reduce(tbb::blocked_range<int>(start, stop), task);
 +      parallel_reduce(range, task);
        if (settings->userdata_chunk) {
          memcpy(settings->userdata_chunk, task.userdata_chunk, settings->userdata_chunk_size);
        }
      }
      else {
 -      parallel_for(tbb::blocked_range<int>(start, stop), task);
 +      parallel_for(range, task);
      }
  
+     BLI_threaded_malloc_end();
      return;
    }
  #endif