[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16459] trunk/blender/source/blender/src/ transform_conversions.c: Bugfix #17495: IPO curve handles go haywire

[Joshua Leung]

Revision: 16459
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16459
Author:   aligorith
Date:     2008-09-10 13:45:42 +0200 (Wed, 10 Sep 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/src/transform_conversions.c

Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c	2008-09-10 11:42:07 UTC (rev 16458)
+++ trunk/blender/source/blender/src/transform_conversions.c	2008-09-10 11:45:42 UTC (rev 16459)
@@ -3942,13 +3942,10 @@
 			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);
 			}
 		}