diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-31 17:04:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-05-31 19:07:55 +0300 |
| commit | 3352dd3a3f4c3deadd6d66068f983a639896446a (patch) | |
| tree | b814613e7b4615d0111e54923f494499efc23f73 /source/blender/depsgraph | |
| parent | 126e6c8e1d2babc69795211e949d7fc03a81639e (diff) | |
Depsgraph: Remove unused flags
They are no longer needed after the active depsgraph concept is here.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_tag.cc | 13 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/nodes/deg_node_time.cc | 1 |
2 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index e22dc331605..e772aefe8cb 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -379,15 +379,6 @@ static void deg_graph_id_tag_update_single_flag(Main *bmain, DepsNodeFactory *factory = deg_type_get_factory(component_type); BLI_assert(factory != NULL); id->recalc |= factory->id_recalc_tag(); - /* NOTE: This way we clearly separate direct animation recalc flag from - * a flushed one. Needed for auto-keyframe hack feature. - * - * TODO(sergey): Find a more generic way to set/access direct tagged ID - * recalc flags. - */ - if (tag == DEG_TAG_TIME) { - id->recalc |= ID_RECALC_TIME; - } /* Some sanity checks before moving forward. */ if (id_node == NULL) { /* Happens when object is tagged for update and not yet in the @@ -454,7 +445,7 @@ void deg_graph_node_tag_zero(Main *bmain, Depsgraph *graph, IDDepsNode *id_node) } ID *id = id_node->id_orig; /* TODO(sergey): Which recalc flags to set here? */ - id->recalc |= ID_RECALC_ALL & ~(DEG_TAG_PSYS_ALL | ID_RECALC_TIME); + id->recalc |= ID_RECALC_ALL & ~(DEG_TAG_PSYS_ALL | ID_RECALC_ANIMATION); GHASH_FOREACH_BEGIN(ComponentDepsNode *, comp_node, id_node->components) { if (comp_node->type == DEG_NODE_TYPE_ANIMATION) { @@ -468,7 +459,7 @@ void deg_graph_node_tag_zero(Main *bmain, Depsgraph *graph, IDDepsNode *id_node) */ continue; } - id->recalc |= ID_RECALC_TIME; + id->recalc |= ID_RECALC_ANIMATION; } comp_node->tag_update(graph); } diff --git a/source/blender/depsgraph/intern/nodes/deg_node_time.cc b/source/blender/depsgraph/intern/nodes/deg_node_time.cc index 7b871d6d42b..1295af666bf 100644 --- a/source/blender/depsgraph/intern/nodes/deg_node_time.cc +++ b/source/blender/depsgraph/intern/nodes/deg_node_time.cc @@ -39,7 +39,6 @@ namespace DEG { void TimeSourceDepsNode::tag_update(Depsgraph *graph) { - graph->scene_cow->id.recalc |= ID_RECALC_TIME; foreach (DepsRelation *rel, outlinks) { DepsNode *node = rel->to; node->tag_update(graph); |