[Bf-blender-cvs] [3f2f709] master: Revert svn r55587, fix for T34698 (Disable snap when transform axis is constrained)

Campbell Barton noreply at git.blender.org
Wed Dec 18 18:57:16 CET 2013


Commit: 3f2f7091d62875844300f9b63bb69734369abd23
Author: Campbell Barton
Date:   Thu Dec 19 04:54:11 2013 +1100
http://developer.blender.org/rB3f2f7091d62875844300f9b63bb69734369abd23

Revert svn r55587, fix for T34698 (Disable snap when transform axis is constrained)

Currently we don't properly support snapping + axis-constraints, but
there are cases where its handy to project-snap for eg, and constraint
to an axis so re-enable this.

===================================================================

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 b7dd8b7..b614ee2 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -290,7 +290,7 @@ eRedrawFlag handleSnapping(TransInfo *t, const wmEvent *event)
 void applyProject(TransInfo *t)
 {
 	/* XXX FLICKER IN OBJECT MODE */
-	if ((t->tsnap.project) && activeSnap(t) && (t->flag & T_NO_PROJECT) == 0 && (t->con.mode & CON_APPLY) == 0) {
+	if ((t->tsnap.project) && activeSnap(t) && (t->flag & T_NO_PROJECT) == 0) {
 		TransData *td = t->data;
 		float tvec[3];
 		float imat[4][4];




More information about the Bf-blender-cvs mailing list