Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 6 Jun 2017 10:17:07 +0000 (12:17 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 6 Jun 2017 10:17:07 +0000 (12:17 +0200)
16 files changed:
1  2 
source/blender/depsgraph/intern/builder/deg_builder.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_eval.cc
source/blender/depsgraph/intern/depsgraph_query.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/depsgraph/intern/depsgraph_type_defines.cc
source/blender/depsgraph/intern/eval/deg_eval.cc
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node_component.cc

index 2041235ade17476e094fdd426ea9e96d97548d49,3249867e41624d8d576a51fcd862d7ca37c85acc..556db3bd6511523e53e178b3501a3c60cabe8b70
  
  #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"
index aa04e0e888ca01a6dfaf6a32b6d0209410e02722,6a9568e7e8df6a384d9852b1026cae6cb4884f9f..08a897df2aa2fac98569c155856b97cbd204c926
@@@ -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"
index 64e130ba3b97db7348409174612b21a92a59cbdb,85a0d336d287ec754fb47ffbdffdfcc0165c0e5d..62d591f65deff4f72435b190e135ae25cdfa9c48
  #include "BLI_utildefines.h"
  #include "BLI_ghash.h"
  
 -#include "DNA_scene_types.h"
 -
 -#include "BKE_depsgraph.h"
+ extern "C" {
  #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"
index 4241325d5715ec4e3f0eaf10c659de67922e0513,e58a7a324072a11d6f4ff4c651fe3f49e32040f8..1179575f71646b2352c0ed19b9b37e1a76ad0339
  #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)
  {
index 046037d8b1d3cbfe754dd996e0b85905e8cf78b3,98b107184043e75b112403c9e7ada82b94b5db2a..15ad6b8054ddd8527ec0804f23e307deacfc7788
  #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"