diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 15:23:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 15:26:28 +0300 |
| commit | d33557c52e1ac221078c66d1b480fb3aaa3f6cd4 (patch) | |
| tree | bd9f785bc3f085ab2520811c2763eed683da2ff3 /source/blender/editors/transform/transform_snap.c | |
| parent | 2f766f8ad2ad6e1827468cd0e33c30672663e704 (diff) | |
Correct fix for T39161: Scaling & snap
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 28039a7d4ee..dfa5032d303 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -821,7 +821,7 @@ static void ApplySnapResize(TransInfo *t, float vec[3]) dist = ResizeBetween(t, t->tsnap.snapTarget, point); } - copy_v3_fl(vec, dist * M_SQRT3); + copy_v3_fl(vec, dist); } /********************** DISTANCE **************************/ @@ -888,6 +888,8 @@ static float ResizeBetween(TransInfo *t, const float p1[3], const float p2[3]) sub_v3_v3v3(d1, p1, t->center_global); sub_v3_v3v3(d2, p2, t->center_global); + project_v3_v3v3(d1, d1, d2); + if (t->con.applyRot != NULL && (t->con.mode & CON_APPLY)) { mul_m3_v3(t->con.pmtx, d1); mul_m3_v3(t->con.pmtx, d2); |