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/transform | |
| 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/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 2769112e5d5..ebd25271a8a 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -3014,11 +3014,9 @@ static void posttrans_action_clean (bAnimContext *ac, bAction *act) AnimData *adt= ANIM_nla_mapping_get(ac, ale); if (adt) { - ListBase nlabackup; - - ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1); posttrans_fcurve_clean(ale->key_data); - ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 1, 1); } else posttrans_fcurve_clean(ale->key_data); @@ -4785,11 +4783,9 @@ void special_aftertrans_update(bContext *C, TransInfo *t) ((cancelled == 0) || (duplicate)) ) { if (adt) { - ListBase nlabackup; - - ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1); posttrans_fcurve_clean(fcu); - ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1); } else posttrans_fcurve_clean(fcu); @@ -4868,11 +4864,9 @@ void special_aftertrans_update(bContext *C, TransInfo *t) ((cancelled == 0) || (duplicate)) ) { if (adt) { - ListBase nlabackup; - - ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 0, 1); posttrans_fcurve_clean(fcu); - ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1, &nlabackup); + ANIM_nla_mapping_apply_fcurve(adt, fcu, 1, 1); } else posttrans_fcurve_clean(fcu); |