diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-02 09:25:14 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-02 09:25:14 +0400 |
| commit | f3c47a66b0cb3bb70505ed46522e6c557769eaa5 (patch) | |
| tree | 843833bd2ec06f5250004f2462b25d4d7f879e67 /source/blender/blenkernel/intern/nla.c | |
| parent | b47605d841d0c01b31199bce4499548ecf259bf1 (diff) | |
NLA SoC: Separating out F-Modifier API
* F-Modifier API is now in its own file in blenkernel
* Renamed and refactored these so that they're no dependent on F-Curves, since all they really used was the fcu->modifiers list
* Added missing license blocks to a few files
Diffstat (limited to 'source/blender/blenkernel/intern/nla.c')
| -rw-r--r-- | source/blender/blenkernel/intern/nla.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 2b95584dc25..14e658b3903 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -69,8 +69,6 @@ // TODO: with things like transitions, should these get freed too? Maybe better as a UI tool void free_nlastrip (ListBase *strips, NlaStrip *strip) { - FModifier *fcm, *fmn; - /* sanity checks */ if (strip == NULL) return; @@ -86,13 +84,8 @@ void free_nlastrip (ListBase *strips, NlaStrip *strip) /* free own F-Curves */ free_fcurves(&strip->fcurves); - /* free F-Modifiers */ - for (fcm= strip->modifiers.first; fcm; fcm= fmn) { - fmn= fcm->next; - - BLI_remlink(&strip->modifiers, fcm); - fcurve_remove_modifier(NULL, fcm); - } + /* free own F-Modifiers */ + free_fmodifiers(&strip->modifiers); /* free the strip itself */ if (strips) @@ -167,7 +160,7 @@ NlaStrip *copy_nlastrip (NlaStrip *strip) /* copy F-Curves and modifiers */ copy_fcurves(&strip_d->fcurves, &strip->fcurves); - fcurve_copy_modifiers(&strip_d->modifiers, &strip->modifiers); + copy_fmodifiers(&strip_d->modifiers, &strip->modifiers); /* return the strip */ return strip_d; |