[Bf-blender-cvs] [47fd882e79f] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 47fd882e79f337a90a66f8b9a21bfe92c7e5f25e
Author: Sergey Sharybin
Date:   Tue Jun 6 12:17:07 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB47fd882e79f337a90a66f8b9a21bfe92c7e5f25e

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
index 2041235ade1,3249867e416..556db3bd651
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
@@@ -37,19 -37,18 +37,20 @@@
  
  #include "MEM_guardedalloc.h"
  
- extern "C" {
+ #include "BLI_utildefines.h"
  #include "BLI_blenlib.h"
  #include "BLI_string.h"
- #include "BLI_utildefines.h"
  
+ extern "C" {
  #include "DNA_node_types.h"
 +#include "DNA_layer_types.h"
  #include "DNA_object_types.h"
  #include "DNA_scene_types.h"
  
 +#include "BKE_layer.h"
  #include "BKE_main.h"
  #include "BKE_node.h"
+ } /* extern "C" */
  
  #include "DEG_depsgraph.h"
  #include "DEG_depsgraph_build.h"
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
index aa04e0e888c,6a9568e7e8d..08a897df2aa
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
@@@ -46,9 -46,9 +46,10 @@@ extern "C" 
  #include "DNA_object_types.h"
  #include "DNA_scene_types.h"
  
 +#include "BKE_layer.h"
  #include "BKE_main.h"
  #include "BKE_node.h"
+ } /* extern "C" */
  
  #include "DEG_depsgraph.h"
  #include "DEG_depsgraph_build.h"
diff --cc source/blender/depsgraph/intern/depsgraph_eval.cc
index 64e130ba3b9,85a0d336d28..62d591f65de
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@@ -35,13 -35,14 +35,11 @@@
  #include "BLI_utildefines.h"
  #include "BLI_ghash.h"
  
+ extern "C" {
 -#include "DNA_scene_types.h"
 -
 -#include "BKE_depsgraph.h"
  #include "BKE_scene.h"
+ } /* extern "C" */
  
  #include "DEG_depsgraph.h"
- } /* extern "C" */
  
  #include "intern/eval/deg_eval.h"
  #include "intern/eval/deg_eval_flush.h"
diff --cc source/blender/depsgraph/intern/depsgraph_query.cc
index 4241325d571,e58a7a32407..1179575f716
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@@ -33,21 -33,13 +33,21 @@@
  #include "MEM_guardedalloc.h"
  
  extern "C" {
 +#include "BLI_math.h"
 +#include "BKE_anim.h"
  #include "BKE_idcode.h"
 +#include "BKE_layer.h"
  #include "BKE_main.h"
+ } /* extern "C" */
  
 +#include "DNA_object_types.h"
 +#include "DNA_scene_types.h"
 +
 +#include "DEG_depsgraph.h"
  #include "DEG_depsgraph_query.h"
- } /* extern "C" */
  
  #include "intern/depsgraph_intern.h"
 +#include "util/deg_util_foreach.h"
  
  bool DEG_id_type_tagged(Main *bmain, short idtype)
  {
diff --cc source/blender/depsgraph/intern/eval/deg_eval.cc
index 046037d8b1d,98b10718404..15ad6b8054d
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@@ -39,10 -38,12 +38,7 @@@
  #include "BLI_task.h"
  #include "BLI_ghash.h"
  
 -extern "C" {
 -#include "BKE_depsgraph.h"
--#include "BKE_global.h"
 -} /* extern "C" */
--
  #include "DEG_depsgraph.h"
- } /* extern "C" */
  
  #include "atomic_ops.h"