diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-01-15 13:34:39 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-01-15 13:34:39 +0300 |
| commit | 39ff5d7eb978d16370c37508c012bd9d319ac348 (patch) | |
| tree | c946d43704c1e8122db612da04a488a41fb75aa3 /source/blender/editors/animation/keyframes_draw.c | |
| parent | aed721e01cc4c0f03b03628f8a5898739c7eaf8e (diff) | |
Reverting changes made in r25940 with the NLA unmapping.
The reverted code was just blindly restoring the old state of the keyframes; changes to selection state, value changes, handle type, etc. were overridden, and the cases where keyframes were deliberately retimed or otherwise were also ignored.
I'm not sure what problems these changes were meant to be solving, but will reassess the situation when I get more info on this.
Diffstat (limited to 'source/blender/editors/animation/keyframes_draw.c')
| -rw-r--r-- | source/blender/editors/animation/keyframes_draw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 63633468767..3a48aa0b063 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -850,13 +850,12 @@ void fcurve_to_keylist(AnimData *adt, FCurve *fcu, DLRBT_Tree *keys, DLRBT_Tree { DLRBT_Tree *beztTree = NULL; BezTriple *bezt; - ListBase nlabackup; int v; if (fcu && fcu->totvert && fcu->bezt) { /* apply NLA-mapping (if applicable) */ if (adt) - ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1); /* if getting long keyframes too, grab the BezTriples in a BST for * accelerated searching... @@ -893,7 +892,7 @@ void fcurve_to_keylist(AnimData *adt, FCurve *fcu, DLRBT_Tree *keys, DLRBT_Tree /* unapply NLA-mapping if applicable */ if (adt) - ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1); } } |