[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27801] trunk/blender/source/blender/ editors/transform: [#21767] Project Vert.

[Martin Poirier]

Revision: 27801
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27801
Author:   theeth
Date:     2010-03-28 15:59:33 +0200 (Sun, 28 Mar 2010)

Log Message:
-----------
[#21767] Project Vert. on the Surf. of Other Obj. enabled causes crash when trying to Crease some edges

Don't want to project for Crease (and others).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform.h
    trunk/blender/source/blender/editors/transform/transform_snap.c

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2010-03-28 13:48:11 UTC (rev 27800)
+++ trunk/blender/source/blender/editors/transform/transform.c	2010-03-28 13:59:33 UTC (rev 27801)
@@ -1462,7 +1462,6 @@
 		t->launch_event = LEFTMOUSE;
 	}
 
-
 	if (!initTransInfo(C, t, op, event))					// internal data, mouse, vectors
 	{
 		return 0;
@@ -3825,7 +3824,7 @@
 
 	t->num.increment = t->snap[1];
 
-	t->flag |= T_NO_CONSTRAINT;
+	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
 }
 
 int BevelWeight(TransInfo *t, short mval[2])
@@ -3898,7 +3897,7 @@
 
 	t->num.increment = t->snap[1];
 
-	t->flag |= T_NO_CONSTRAINT;
+	t->flag |= T_NO_CONSTRAINT|T_NO_PROJECT;
 }
 
 int Crease(TransInfo *t, short mval[2])

Modified: trunk/blender/source/blender/editors/transform/transform.h
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.h	2010-03-28 13:48:11 UTC (rev 27800)
+++ trunk/blender/source/blender/editors/transform/transform.h	2010-03-28 13:59:33 UTC (rev 27801)
@@ -379,6 +379,9 @@
 	/* to specificy if we save back settings at the end */
 #define	T_MODAL				(1 << 21)
 
+	/* no retopo */
+#define T_NO_PROJECT		(1 << 22)
+
 /* TransInfo->modifiers */
 #define	MOD_CONSTRAINT_SELECT	0x01
 #define	MOD_PRECISION			0x02

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c	2010-03-28 13:48:11 UTC (rev 27800)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c	2010-03-28 13:59:33 UTC (rev 27801)
@@ -233,7 +233,7 @@
 void applyProject(TransInfo *t)
 {
 	/* XXX FLICKER IN OBJECT MODE */
-	if ((t->tsnap.project) && activeSnap(t))
+	if ((t->tsnap.project) && activeSnap(t) && (t->flag & T_NO_PROJECT) == 0)
 	{
 		TransData *td = t->data;
 		float tvec[3];