[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12659] trunk/blender/source/blender/src/ transform.c: Bugfix #7654: Keyframe translation in (Action/NLA) wasn' t working correctly for scaled actions

[Joshua Leung]

Revision: 12659
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12659
Author:   aligorith
Date:     2007-11-23 12:07:57 +0100 (Fri, 23 Nov 2007)

Log Message:
-----------
Bugfix #7654: Keyframe translation in (Action/NLA) wasn't working correctly for scaled actions

Scaled action times were getting calculated twice, which meant that translating a keyframe resulted in the keyframe "not following the mouse position".

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

Modified: trunk/blender/source/blender/src/transform.c
===================================================================
--- trunk/blender/source/blender/src/transform.c	2007-11-22 23:34:02 UTC (rev 12658)
+++ trunk/blender/source/blender/src/transform.c	2007-11-23 11:07:57 UTC (rev 12659)
@@ -3536,18 +3536,6 @@
 		double secf= FPS;
 		float val= t->fac;
 		
-		/* take into account scaling (for Action Editor only) */
-		if ((t->spacetype == SPACE_ACTION) && (NLA_ACTION_SCALED)) {
-			float cval, sval[2];
-			
-			/* recalculate the delta based on 'visual' times */
-			areamouseco_to_ipoco(G.v2d, t->imval, &sval[0], &sval[1]);
-			cval= sval[0] + t->fac;
-			
-			val = get_action_frame_inv(OBACT, cval);
-			val -= get_action_frame_inv(OBACT, sval[0]);
-		}	
-		
 		/* apply snapping + frame->seconds conversions */
 		if (autosnap == SACTSNAP_STEP) {
 			if (doTime)
@@ -3575,7 +3563,6 @@
 	double secf= FPS;
 	
 	short autosnap= getAnimEdit_SnapMode(t);
-	float cval= sval + t->fac;
 	
 	float deltax, val;
 	
@@ -3588,8 +3575,7 @@
 		
 		/* check if any need to apply nla-scaling */
 		if (ob) {
-			deltax = get_action_frame_inv(ob, cval);
-			deltax -= get_action_frame_inv(ob, sval);
+			deltax = t->fac;
 			
 			if (autosnap == SACTSNAP_STEP) {
 				if (doTime)