archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Cleanup, split build_animation

Browse Source
This commit is contained in:
Sergey Sharybin
2017-12-04 18:34:27 +01:00
parent 9f9b666d9a
commit f1ad6b43b3
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@@ -870,26 +870,35 @@ void DepsgraphRelationBuilder::build_constraints(ID *id,
} }
void DepsgraphRelationBuilder::build_animdata(ID *id) void DepsgraphRelationBuilder::build_animdata(ID *id)
{
/* Animation curves and NLA. */
build_animdata_curves(id);
/* Drivers. */
build_animdata_drievrs(id);
}
void DepsgraphRelationBuilder::build_animdata_curves(ID *id)
{ {
AnimData *adt = BKE_animdata_from_id(id); AnimData *adt = BKE_animdata_from_id(id);
if (adt == NULL) {
if (adt == NULL)
return; return;
ComponentKey adt_key(id, DEG_NODE_TYPE_ANIMATION);
/* animation */
if (adt->action || adt->nla_tracks.first) {
/* wire up dependency to time source */
TimeSourceKey time_src_key;
add_relation(time_src_key, adt_key, "TimeSrc -> Animation");
// XXX: Hook up specific update callbacks for special properties which may need it...
// XXX: animdata "hierarchy" - top-level overrides need to go after lower-down
} }
ComponentKey adt_key(id, DEG_NODE_TYPE_ANIMATION);
if (adt->action == NULL && adt->nla_tracks.first == NULL) {
return;
}
/* Wire up dependency to time source. */
TimeSourceKey time_src_key;
add_relation(time_src_key, adt_key, "TimeSrc -> Animation");
}
/* drivers */ void DepsgraphRelationBuilder::build_animdata_drievrs(ID *id)
{
AnimData *adt = BKE_animdata_from_id(id);
if (adt == NULL) {
return;
}
ComponentKey adt_key(id, DEG_NODE_TYPE_ANIMATION);
LINKLIST_FOREACH (FCurve *, fcu, &adt->drivers) { LINKLIST_FOREACH (FCurve *, fcu, &adt->drivers) {
OperationKey driver_key(id, OperationKey driver_key(id,
DEG_NODE_TYPE_PARAMETERS, DEG_NODE_TYPE_PARAMETERS,

2
source/blender/depsgraph/intern/builder/deg_builder_relations.h
View File

@@ -197,6 +197,8 @@ struct DepsgraphRelationBuilder
ListBase *constraints, ListBase *constraints,
RootPChanMap *root_map); RootPChanMap *root_map);
void build_animdata(ID *id); void build_animdata(ID *id);
void build_animdata_curves(ID *id);
void build_animdata_drievrs(ID *id);
void build_driver(ID *id, FCurve *fcurve); void build_driver(ID *id, FCurve *fcurve);
void build_driver_data(ID *id, FCurve *fcurve); void build_driver_data(ID *id, FCurve *fcurve);
void build_driver_variables(ID *id, FCurve *fcurve); void build_driver_variables(ID *id, FCurve *fcurve);