diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-02-04 04:30:44 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-02-04 04:30:44 +0300 |
commit | 2da3bd32dd34e44a326a30c43b33e75dc65ce95a (patch) | |
tree | 0d010fdcff0620ef51a11e3edd12c4bcefe8ff02 /source | |
parent | 9c12534cd9ad4e0ec432dc58525d9df7d8ccc6f5 (diff) |
Bugfix:
AfterTrans Delete Duplicates feature for Action Editor now doesn't remove duplicates if you cancelled the transform.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/src/transform_conversions.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index 8d4f46ddeed..496454274e5 100644 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -3404,8 +3404,11 @@ void special_aftertrans_update(TransInfo *t) remake_action_ipos((bAction *)data); /* Do curve cleanups? */ - if ((G.saction->flag & SACTION_NOTRANSKEYCULL)==0) + if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && + (cancelled == 0) ) + { posttrans_action_clean((bAction *)data); + } G.saction->flag &= ~SACTION_MOVING; } @@ -3420,8 +3423,11 @@ void special_aftertrans_update(TransInfo *t) testhandles_ipocurve(icu); } - if ((G.saction->flag & SACTION_NOTRANSKEYCULL)==0) + if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && + (cancelled == 0) ) + { posttrans_ipo_clean(key->ipo); + } } DAG_object_flush_update(G.scene, OBACT, OB_RECALC_DATA); |