diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-05-30 15:05:29 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-05-30 15:05:29 +0400 |
commit | aa4d64d7ff17d4557acd74540914de872a32ba81 (patch) | |
tree | 5b347b6aef28850789668148352f5941ea711e78 /source/blender/blenkernel/intern/nla.c | |
parent | 32d0533f78c63d5d95b693e1e6e65144203dc42a (diff) |
NLA SoC: Bugfixes for previous commit
* Compile fix in nla_draw.c
* Not totally correct yet, but now NLA-tracks get drawn too after action 'push-down'
Diffstat (limited to 'source/blender/blenkernel/intern/nla.c')
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index d062a2ab14b..3356f599c59 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -427,8 +427,10 @@ void BKE_nla_action_pushdown (AnimData *adt) * as that will cause us grief down the track */ // TODO: what about modifiers? - if (action_has_motion(adt->action) == 0) + if (action_has_motion(adt->action) == 0) { + printf("BKE_nla_action_pushdown(): action has no data \n"); return; + } /* add a new NLA track to house this action * - we could investigate trying to fit the action into an appropriately @@ -436,8 +438,10 @@ void BKE_nla_action_pushdown (AnimData *adt) * changes in blending behaviour... */ nlt= add_nlatrack(adt); - if (nlt == NULL) + if (nlt == NULL) { + printf("BKE_nla_action_pushdown(): no NLA-track added \n"); return; + } /* add a new NLA strip to the track, which references the active action */ strip= add_nlastrip(nlt, adt->action); @@ -448,6 +452,9 @@ void BKE_nla_action_pushdown (AnimData *adt) adt->action= NULL; } + // TEMP DEBUG... + printf("BKE_nla_action_pushdown(): NLA strip added.. done \n"); + // TODO: set any other flags necessary here... } |