[Bf-blender-cvs] [3352dd3a3f4] blender2.8: Depsgraph: Remove unused flags

[Sergey Sharybin]

Commit: 3352dd3a3f4c3deadd6d66068f983a639896446a
Author: Sergey Sharybin
Date:   Thu May 31 16:04:17 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3352dd3a3f4c3deadd6d66068f983a639896446a

Depsgraph: Remove unused flags

They are no longer needed after the active depsgraph concept is here.

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

M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/depsgraph/intern/nodes/deg_node_time.cc
M	source/blender/makesdna/DNA_ID.h
M	source/blender/makesdna/DNA_anim_types.h

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

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 0af61623cdc..f73fc9739b0 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2956,13 +2956,6 @@ void BKE_animsys_eval_animdata(Depsgraph *depsgraph, ID *id)
 	                      */
 	DEG_debug_print_eval_time(depsgraph, __func__, id->name, id, ctime);
 	short recalc = ADT_RECALC_ANIM;
-	const Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
-	/* If animation component is directly tagged for update, we always apply f-curves. */
-	if (((scene_eval->id.recalc & ID_RECALC_TIME) == 0) &&
-	    (id->recalc & ID_RECALC_TIME) == 0)
-	{
-		recalc |= ADT_RECALC_CHECK_ORIG_DNA;
-	}
 	BKE_animsys_evaluate_animdata(depsgraph, scene, id, adt, ctime, recalc);
 }
 
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);
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 7af0939f454..6853f5048f1 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -492,7 +492,6 @@ enum {
 	ID_RECALC_GEOMETRY    = 1 << 4,
 	ID_RECALC_TRANSFORM   = 1 << 5,
 	ID_RECALC_COPY_ON_WRITE = 1 << 6,
-	ID_RECALC_TIME          = 1 << 7,
 	/* Special flag to check if SOMETHING was changed. */
 	ID_RECALC_ALL   = (~(int)0),
 };
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 2839b393fcd..242ff61c616 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -963,8 +963,6 @@ typedef enum eAnimData_Flag {
 typedef enum eAnimData_Recalc {
 	ADT_RECALC_DRIVERS      = (1 << 0),
 	ADT_RECALC_ANIM         = (1 << 1),
-	/* Only apply f-curve value if its original DNA value matches current DNA value. */
-	ADT_RECALC_CHECK_ORIG_DNA = (1 << 2),
 	ADT_RECALC_ALL          = (ADT_RECALC_DRIVERS | ADT_RECALC_ANIM)
 } eAnimData_Recalc;