Commit: 09df9c761fa01a82b06c388e23a68ecc9dd4c59c
Author: Joshua Leung
Date: Tue Dec 9 15:56:38 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rB09df9c761fa01a82b06c388e23a68ecc9dd4c59c
Don't include animation -> drivers link if there is no animation to require it
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_relations.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index b46994c..5f6d333 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -496,7 +496,8 @@ void DepsgraphRelationBuilder::build_constraints(Scene
*scene, ID *id, eDepsNode
void DepsgraphRelationBuilder::build_animdata(ID *id)
{
AnimData *adt = BKE_animdata_from_id(id);
- if (!adt)
+
+ if (adt == NULL)
return;
ComponentKey adt_key(id, DEPSNODE_TYPE_ANIMATION);
@@ -520,9 +521,10 @@ void DepsgraphRelationBuilder::build_animdata(ID *id)
// ...
/* prevent driver from occurring before own animation... */
- // NOTE: probably not strictly needed (anim before parameters
anyway)...
- add_relation(adt_key, driver_key, DEPSREL_TYPE_OPERATION,
- "[AnimData Before Drivers] DepsRel");
+ if (adt->action || adt->nla_tracks.first) {
+ add_relation(adt_key, driver_key,
DEPSREL_TYPE_OPERATION,
+ "[AnimData Before Drivers]
DepsRel");
+ }
build_driver(id, fcurve);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
