griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: add proper handling of actions contained in NLA strips.

Browse Source
This commit is contained in:
Alexander Gavrilov
2018-11-07 18:14:00 +03:00
parent b82eac8986
commit 921cad194d
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -859,6 +859,11 @@ void DepsgraphNodeBuilder::build_animdata(ID *id)
*/
}
/* NLA strips contain actions */
LISTBASE_FOREACH (NlaTrack *, nlt, &adt->nla_tracks) {
build_animdata_nlastrip_targets(&nlt->strips);
}
/* drivers */
int driver_index = 0;
LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) {
@@ -868,6 +873,18 @@ void DepsgraphNodeBuilder::build_animdata(ID *id)
}
}
void DepsgraphNodeBuilder::build_animdata_nlastrip_targets(ListBase *strips)
{
LISTBASE_FOREACH (NlaStrip *, strip, strips) {
if (strip->act != NULL) {
build_action(strip->act);
}
else if (strip->strips.first != NULL) {
build_animdata_nlastrip_targets(&strip->strips);
}
}
}
void DepsgraphNodeBuilder::build_action(bAction *action)
{
if (built_map_.checkIsBuiltAndTag(action)) {

1
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
View File

@@ -192,6 +192,7 @@ struct DepsgraphNodeBuilder {
void build_particle_settings(ParticleSettings *part);
void build_cloth(Object *object);
void build_animdata(ID *id);
void build_animdata_nlastrip_targets(ListBase *strips);
void build_action(bAction *action);
void build_driver(ID *id, FCurve *fcurve, int driver_index);
void build_driver_variables(ID *id, FCurve *fcurve);

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

@@ -1192,6 +1192,11 @@ void DepsgraphRelationBuilder::build_animdata_nlastrip_targets(
{
LISTBASE_FOREACH(NlaStrip *, strip, strips) {
if (strip->act != NULL) {
build_action(strip->act);
ComponentKey action_key(&strip->act->id, DEG_NODE_TYPE_ANIMATION);
add_relation(action_key, adt_key, "Action -> Animation");
build_animdata_curves_targets(id, adt_key,
operation_from,
&strip->act->curves);