[Bf-blender-cvs] [df721016310] blender2.8: Revert unintended changes to depsgraph

Dalai Felinto noreply at git.blender.org
Mon Jun 11 11:33:30 CEST 2018


Commit: df72101631097cd57a093645378e1de338f875e8
Author: Dalai Felinto
Date:   Mon Jun 11 11:31:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdf72101631097cd57a093645378e1de338f875e8

Revert unintended changes to depsgraph

This partially reverts f8d7df6f162.
I committed this bit by mistake.

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

M	source/blender/depsgraph/intern/depsgraph_tag.cc

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

diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 437999a06a9..8ff11ca5fd2 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -449,7 +449,17 @@ void deg_graph_node_tag_zero(Main *bmain, Depsgraph *graph, IDDepsNode *id_node)
 	GHASH_FOREACH_BEGIN(ComponentDepsNode *, comp_node, id_node->components)
 	{
 		if (comp_node->type == DEG_NODE_TYPE_ANIMATION) {
-			continue;
+			AnimData *adt = BKE_animdata_from_id(id);
+			/* NOTE: Animation data might be null if relations are tagged
+			 * for update.
+			 */
+			if (adt == NULL || (adt->recalc & ADT_RECALC_ANIM) == 0) {
+				/* If there is no animation, or animation is not tagged for
+				 * update yet, we don't force animation channel to be evaluated.
+				 */
+				continue;
+			}
+			id->recalc |= ID_RECALC_ANIMATION;
 		}
 		comp_node->tag_update(graph);
 	}



More information about the Bf-blender-cvs mailing list