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-06-30 16:42:17 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-06-30 16:55:14 +0300
commit72d21fbd346a5afd102882a56214ba773a15b88d (patch)
tree2bf4e765a2176ef8f83239650a7d6bb115313131 /source/blender/editors
parent6de17c60bf65d8c0479dd5e1ee75071ab169624c (diff)
Fix for mistake in grid-snap patch
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/transform/transform_constraints.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index 3063ee22c55..b546ff9449c 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -310,7 +310,7 @@ static void applyAxisConstraintVec(TransInfo *t, TransData *td, const float in[3
mul_m3_v3(t->con.pmtx, out);
// With snap, a projection is alright, no need to correct for view alignment
- if (ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID) || activeSnap(t)) {
+ if (!(!ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID) && activeSnap(t))) {
if (getConstraintSpaceDimension(t) == 2) {
if (out[0] != 0.0f || out[1] != 0.0f || out[2] != 0.0f) {
planeProjection(t, in, out);