Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Jun 2017 12:16:43 +0000 (14:16 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Jun 2017 12:16:43 +0000 (14:16 +0200)
12 files changed:
1  2 
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/depsgraph.cc
source/blender/depsgraph/intern/depsgraph.h
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_types.h
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/depsgraph/intern/nodes/deg_node.cc
source/blender/depsgraph/intern/nodes/deg_node.h

index 82b8ca65c7b9e8199679c4556ba6868bf353375d,51d4ed914199c20df0193f2a4dc6d5eccc5d9e8b..4a79f9c54b2bc5257b3857c1b62a7f62c887145b
@@@ -77,21 -77,19 +77,20 @@@ static const char *deg_debug_colors_lig
  
  #ifdef COLOR_SCHEME_NODE_TYPE
  static const int deg_debug_node_type_color_map[][2] = {
-     {DEG_NODE_TYPE_ROOT,         0},
-     {DEG_NODE_TYPE_TIMESOURCE,   1},
-     {DEG_NODE_TYPE_ID_REF,       2},
+     {DEG_NODE_TYPE_TIMESOURCE,   0},
 -    {DEG_NODE_TYPE_ID_REF,       2},
++    {DEG_NODE_TYPE_ID_REF,       1},
  
      /* Outer Types */
-     {DEG_NODE_TYPE_PARAMETERS,        3},
-     {DEG_NODE_TYPE_PROXY,             4},
-     {DEG_NODE_TYPE_ANIMATION,         5},
-     {DEG_NODE_TYPE_TRANSFORM,         6},
-     {DEG_NODE_TYPE_GEOMETRY,          7},
-     {DEG_NODE_TYPE_SEQUENCER,         8},
-     {DEG_NODE_TYPE_SHADING,           9},
-     {DEG_NODE_TYPE_CACHE,             10},
-     {DEG_NODE_TYPE_LAYER_COLLECTIONS, 11},
 -    {DEG_NODE_TYPE_PARAMETERS,   2},
 -    {DEG_NODE_TYPE_PROXY,        3},
 -    {DEG_NODE_TYPE_ANIMATION,    4},
 -    {DEG_NODE_TYPE_TRANSFORM,    5},
 -    {DEG_NODE_TYPE_GEOMETRY,     6},
 -    {DEG_NODE_TYPE_SEQUENCER,    7},
 -    {DEG_NODE_TYPE_SHADING,      8},
 -    {DEG_NODE_TYPE_CACHE,        9},
 -    {-1,                         0}
++    {DEG_NODE_TYPE_PARAMETERS,        2},
++    {DEG_NODE_TYPE_PROXY,             3},
++    {DEG_NODE_TYPE_ANIMATION,         4},
++    {DEG_NODE_TYPE_TRANSFORM,         5},
++    {DEG_NODE_TYPE_GEOMETRY,          6},
++    {DEG_NODE_TYPE_SEQUENCER,         7},
++    {DEG_NODE_TYPE_SHADING,           8},
++    {DEG_NODE_TYPE_CACHE,             9},
++    {DEG_NODE_TYPE_LAYER_COLLECTIONS, 10},
 +    {-1,                              0}
  };
  #endif
  
index 8c9de1faeb2d35aa01dcdd485a2d3807b8b6c078,43d8d560856126c069212b6184155994cb79779b..e3d5644e1f60ab666ceaf69671c34d83c0292724
@@@ -67,8 -69,9 +67,8 @@@ static DEG_EditorUpdateSceneCb deg_edit
  static DEG_EditorUpdateScenePreCb deg_editor_update_scene_pre_cb = NULL;
  
  Depsgraph::Depsgraph()
-   : root_node(NULL),
+   : time_source(NULL),
 -    need_update(false),
 -    layers(0)
 +    need_update(false)
  {
        BLI_spin_init(&lock);
        id_hash = BLI_ghash_ptr_new("Depsgraph id hash");