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-29 13:10:14 +0300
commit15364094d0223fd7606b685f9e2cba9001100c8f (patch)
tree3327ec89aae15b19e5f43166eb50c8e1bf77bc2b
parent62a973db317af202dff47f2702e6a2f53b8efb2a (diff)
Fix snap-scale w/ axis constraint
Related to T46503, fix only worked when the snap target was axis-aligned.
-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 8e429ee2085..278d56e032b 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);