Commit: 4577bda634039966b2d03f8991a686d4be6f6285
Author: Sergey Sharybin
Date: Tue Jun 13 14:16:43 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB4577bda634039966b2d03f8991a686d4be6f6285
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
index 82b8ca65c7b,51d4ed91419..4a79f9c54b2
--- a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
@@@ -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
diff --cc source/blender/depsgraph/intern/depsgraph.cc
index 8c9de1faeb2,43d8d560856..e3d5644e1f6
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@@ -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");
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
