diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 13:27:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 13:42:27 +0300 |
commit | 3dd16946aa43e804d028262f7368346c56ba1045 (patch) | |
tree | dd44ed7f24d3e50d1b57fd11ec62252f41b80cec /source/blender/editors/transform | |
parent | fed0448f920aa85245c8762c6e4abc79ecc046d8 (diff) |
Fix T39161: Scaling fails w/ snap-to-point
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 8 |
1 files changed, 6 insertions, 2 deletions
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 **************************/ |