Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 11 Jan 2018 14:14:30 +0000 (15:14 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 11 Jan 2018 14:14:30 +0000 (15:14 +0100)
1  2 
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/depsgraph/intern/eval/deg_eval.cc
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/modifiers/intern/MOD_meshdeform.c

index 116f853ebdf988f73dc801d259fb03e8f38c5b97,c29a0708cef949ff02303469b0861d2e64bbeeb4..a6c6a16a52803732972353de8dab34a4e8d81010
@@@ -129,15 -141,15 +129,14 @@@ static void calculate_pending_func
        }
  }
  
 -static void calculate_pending_parents(Depsgraph *graph, unsigned int layers)
 +static void calculate_pending_parents(Depsgraph *graph)
  {
        const int num_operations = graph->operations.size();
-       const bool do_threads = (num_operations > 256);
        CalculatePengindData data;
        data.graph = graph;
 -      data.layers = layers;
        ParallelRangeSettings settings;
        BLI_parallel_range_settings_defaults(&settings);
-       settings.use_threading = do_threads;
+       settings.min_iter_per_thread = 1024;
        BLI_task_parallel_range(0,
                                num_operations,
                                &data,