[Bf-blender-cvs] [3dd1694] master: Fix T39161: Scaling fails w/ snap-to-point

Campbell Barton noreply at git.blender.org
Wed Aug 26 12:47:33 CEST 2015


Commit: 3dd16946aa43e804d028262f7368346c56ba1045
Author: Campbell Barton
Date:   Wed Aug 26 20:27:04 2015 +1000
Branches: master
https://developer.blender.org/rB3dd16946aa43e804d028262f7368346c56ba1045

Fix T39161: Scaling fails w/ snap-to-point

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

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

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

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 55ac166..28039a7 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -810,14 +810,18 @@ static void ApplySnapRotation(TransInfo *t, float *value)
 
 static void ApplySnapResize(TransInfo *t, float vec[3])
 {
+	float dist;
+
 	if (t->tsnap.target == SCE_SNAP_TARGET_CLOSEST) {
-		vec[0] = vec[1] = vec[2] = t->tsnap.dist;
+		dist = t->tsnap.dist;
 	}
 	else {
 		float point[3];
 		getSnapPoint(t, point);
-		vec[0] = vec[1] = vec[2] = ResizeBetween(t, t->tsnap.snapTarget, point);
+		dist = ResizeBetween(t, t->tsnap.snapTarget, point);
 	}
+
+	copy_v3_fl(vec, dist * M_SQRT3);
 }
 
 /********************** DISTANCE **************************/




More information about the Bf-blender-cvs mailing list