Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-10-23 04:27:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-10-23 04:27:15 +0300
commit62225057394b61c66cb7cb2ce1e9b8c62170c0d8 (patch)
tree35e731d220f9e8ed4e8a31955b97dc9fb72ef38f /source/blender/editors/transform/transform_snap.c
parent586ec500226054252d782d5ce6d3c5e617be5cf8 (diff)
Fix snap-scale w/ axis constraint
Related to T46503, fix only worked when the snap target was axis-aligned.
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
-rw-r--r--source/blender/editors/transform/transform_snap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 0e954d40c18..2258a56ee4a 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -889,13 +889,13 @@ 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);
}
+
+ project_v3_v3v3(d1, d1, d2);
len_d1 = len_v3(d1);