From f5c19c2c35192a7874f7e08362fb37f8a842521c Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 10 Sep 2008 11:45:42 +0000 Subject: [PATCH] Bugfix #17495: IPO curve handles go haywire When editing IPO curve handles on a curve that belongs to a NLA-strip with repeat != 1 and 'AutoMerge Keyframes' on, the scaling correction was causing more problems than it was worth. --- source/blender/src/transform_conversions.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c index 0b43dac07cf..0984b2c3175 100644 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -3942,13 +3942,10 @@ void special_aftertrans_update(TransInfo *t) if ( (G.sipo->flag & SIPO_NOTRANSKEYCULL)==0 && (cancelled == 0) ) { - if (NLA_IPO_SCALED) { - actstrip_map_ipo_keys(OBACT, G.sipo->ipo, 0, 1); - posttrans_ipo_clean(G.sipo->ipo); - actstrip_map_ipo_keys(OBACT, G.sipo->ipo, 1, 1); - } - else - posttrans_ipo_clean(G.sipo->ipo); + /* NOTE: no need to do NLA scaling stuff here, as when there is NLA scaling, + * the transformed handles will get moved wrong (seem to match wrong repeat cycle) + */ + posttrans_ipo_clean(G.sipo->ipo); } }