[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37695] trunk/blender/source/blender/ editors/transform/transform_snap.c: Snapping/Project

[Martin Poirier]

Revision: 37695
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37695
Author:   theeth
Date:     2011-06-21 15:28:13 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
Snapping/Project

Disable editmesh as target if proportional edit is on (that was messed up incorrectly in revision 33233)

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=33233

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

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c	2011-06-21 13:02:21 UTC (rev 37694)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c	2011-06-21 15:28:13 UTC (rev 37695)
@@ -385,8 +385,8 @@
 		if (t->tsnap.applySnap != NULL && // A snapping function actually exist
 			(obedit != NULL && ELEM4(obedit->type, OB_MESH, OB_ARMATURE, OB_CURVE, OB_LATTICE)) ) // Temporary limited to edit mode meshes, armature, curves
 		{
-			/* editmode meshes now supported */
-			if ((obedit->type != OB_MESH) && ((t->flag & T_PROP_EDIT) || t->tsnap.project)) /* also exclude edit for project, for now */
+			/* Exclude editmesh if using proportional edit */
+			if ((obedit->type == OB_MESH) && (t->flag & T_PROP_EDIT))
 			{
 				t->tsnap.modeSelect = SNAP_NOT_OBEDIT;
 			}