[Bf-blender-cvs] [5d38c141168] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 5d38c141168fcc4dc6aa61ee62a28d59dedf889a
Author: Sergey Sharybin
Date:   Wed Jan 10 13:22:03 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB5d38c141168fcc4dc6aa61ee62a28d59dedf889a

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/eval/deg_eval.cc
index 38a7470c0ec,76e76b5eb7b..116f853ebdf
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@@ -100,11 -104,13 +100,12 @@@ static void deg_task_run_func(TaskPool 
  
  typedef struct CalculatePengindData {
  	Depsgraph *graph;
 -	unsigned int layers;
  } CalculatePengindData;
  
- static void calculate_pending_func(void *data_v,
-                                    int i,
-                                    const ParallelRangeTLS * /*tls*/)
+ static void calculate_pending_func(
+         void *__restrict data_v,
+         const int i,
+         const ParallelRangeTLS *__restrict /*tls*/)
  {
  	CalculatePengindData *data = (CalculatePengindData *)data_v;
  	Depsgraph *graph = data->graph;
diff --cc source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 6dc35bb8aba,9e910afea07..c3b1f56a71b
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@@ -71,9 -70,23 +71,10 @@@ typedef std::deque<OperationDepsNode *
  
  namespace {
  
- void flush_init_operation_node_func(void *data_v,
-                                     int i,
-                                     const ParallelRangeTLS * /*tls*/)
 -// TODO(sergey): De-duplicate with depsgraph_tag,cc
 -void lib_id_recalc_tag(Main *bmain, ID *id)
 -{
 -	id->recalc |= ID_RECALC;
 -	DEG_id_type_tag(bmain, GS(id->name));
 -}
 -
 -void lib_id_recalc_data_tag(Main *bmain, ID *id)
 -{
 -	id->recalc |= ID_RECALC_DATA;
 -	DEG_id_type_tag(bmain, GS(id->name));
 -}
 -
+ void flush_init_operation_node_func(
+         void *__restrict data_v,
+         const int i,
+         const ParallelRangeTLS *__restrict /*tls*/)
  {
  	Depsgraph *graph = (Depsgraph *)data_v;
  	OperationDepsNode *node = graph->operations[i];
@@@ -289,12 -292,13 +291,13 @@@ void deg_graph_flush_updates(Main *bmai
  		}
  	}
  	/* Inform editors about all changes. */
 -	flush_editors_id_update(bmain, graph);
 +	flush_editors_id_update(bmain, graph, &update_ctx);
  }
  
- static void graph_clear_func(void *data_v,
-                              int i,
-                              const ParallelRangeTLS * /*tls*/)
+ static void graph_clear_func(
+         void *__restrict data_v,
+         const int i,
+         const ParallelRangeTLS *__restrict /*tls*/)
  {
  	Depsgraph *graph = (Depsgraph *)data_v;
  	OperationDepsNode *node = graph->operations[i];