From 3dd16946aa43e804d028262f7368346c56ba1045 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 26 Aug 2015 20:27:04 +1000 Subject: Fix T39161: Scaling fails w/ snap-to-point --- source/blender/editors/transform/transform_snap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '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 55ac166d861..28039a7d4ee 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 **************************/ -- cgit v1.2.3