[Bf-blender-cvs] [6222505] master: Fix snap-scale w/ axis constraint
Campbell Barton
noreply at git.blender.org
Fri Oct 23 03:34:59 CEST 2015
Commit: 62225057394b61c66cb7cb2ce1e9b8c62170c0d8
Author: Campbell Barton
Date: Fri Oct 23 12:27:15 2015 +1100
Branches: master
https://developer.blender.org/rB62225057394b61c66cb7cb2ce1e9b8c62170c0d8
Fix snap-scale w/ axis constraint
Related to T46503,
fix only worked when the snap target was axis-aligned.
===================================================================
M 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 0e954d4..2258a56 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);
More information about the Bf-blender-cvs
mailing list