[Bf-blender-cvs] [656b9a46b35] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 656b9a46b356d304a688d8661c1958c57b454828
Author: Sergey Sharybin
Date:   Thu Jan 11 15:14:30 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB656b9a46b356d304a688d8661c1958c57b454828

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/eval/deg_eval.cc
index 116f853ebdf,c29a0708cef..a6c6a16a528
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@@ -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,