[Bf-blender-cvs] [b53c280] depsgraph_refactor: Depsgraph: Correction to parameters animation commit

Sergey Sharybin noreply at git.blender.org
Wed Apr 1 17:07:03 CEST 2015


Commit: b53c280d19dd14bc53370453642e80f95d2d49e3
Author: Sergey Sharybin
Date:   Wed Apr 1 20:04:22 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBb53c280d19dd14bc53370453642e80f95d2d49e3

Depsgraph: Correction to parameters animation commit

Drivers are handled a bit differently, so can't really create
relation between animation component and parameters without
having action.

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

M	source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
M	source/blender/depsgraph/intern/depsgraph_build_relations.cpp

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

diff --git a/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp b/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
index 2f2c251..474cd2e 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
@@ -376,6 +376,8 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Base *base, Object *ob)
 
 	/* TODO(sergey): This way using this object's
 	 * proeprties as driver target works fine.
+	 *
+	 * Does this depend on other nodes?
 	 */
 	add_operation_node(&ob->id, DEPSNODE_TYPE_PARAMETERS, DEPSOP_TYPE_POST, NULL,
 	                   DEG_OPCODE_PLACEHOLDER, "Parameters Eval");
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index db920bd..7896489 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -1807,9 +1807,7 @@ bool DepsgraphRelationBuilder::needs_animdata_node(ID *id)
 {
 	AnimData *adt = BKE_animdata_from_id(id);
 	if (adt != NULL) {
-		return adt->action != NULL ||
-		       adt->nla_tracks.first != NULL ||
-		       adt->drivers.first != NULL;
+		return adt->action != NULL;
 	}
 	return false;
 }




More information about the Bf-blender-cvs mailing list