[Bf-blender-cvs] [a6fb670] master: Revert "FCurve Transform: scaling no longer changes hansle types"

Campbell Barton noreply at git.blender.org
Wed Apr 9 12:27:13 CEST 2014


Commit: a6fb6706a88a5e39905c0874772310fafe91bdc2
Author: Campbell Barton
Date:   Wed Apr 9 20:25:37 2014 +1000
https://developer.blender.org/rBa6fb6706a88a5e39905c0874772310fafe91bdc2

Revert "FCurve Transform: scaling no longer changes hansle types"

This reverts commit 6cc5bdc99e63b05248f132833bfe0259c2a27923.

Revent this for 2.70a, it changes behavior too much without allowing
keyframe handles to be scaled some alternative way.

===================================================================

M	source/blender/editors/transform/transform_conversions.c

===================================================================

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 4dd7f3c..455fa45 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -3862,13 +3862,13 @@ static void createTransGraphEditData(bContext *C, TransInfo *t)
 					
 				}
 				/* special hack (must be done after initTransDataCurveHandles(), as that stores handle settings to restore...):
-				 *	- Check if we've got entire BezTriple selected and we're rotating that point,
+				 *	- Check if we've got entire BezTriple selected and we're scaling/rotating that point,
 				 *	  then check if we're using auto-handles.
 				 *	- If so, change them auto-handles to aligned handles so that handles get affected too
 				 */
-				if ((t->mode == TFM_ROTATION) &&
-				    ELEM(bezt->h1, HD_AUTO, HD_AUTO_ANIM) &&
-				    ELEM(bezt->h2, HD_AUTO, HD_AUTO_ANIM))
+				if (ELEM(bezt->h1, HD_AUTO, HD_AUTO_ANIM) &&
+				    ELEM(bezt->h2, HD_AUTO, HD_AUTO_ANIM) &&
+				    ELEM(t->mode, TFM_ROTATION, TFM_RESIZE))
 				{
 					if (hdata && (sel1) && (sel3)) {
 						bezt->h1 = HD_ALIGN;




More information about the Bf-blender-cvs mailing list