[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59093] trunk/blender/source/blender/bmesh /intern/bmesh_marking.c: bmesh: simplify mode check for setting the edge selection

Campbell Barton ideasman42 at gmail.com
Tue Aug 13 02:17:40 CEST 2013


Revision: 59093
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59093
Author:   campbellbarton
Date:     2013-08-13 00:17:39 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
bmesh: simplify mode check for setting the edge selection

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_marking.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_marking.c	2013-08-12 23:49:56 UTC (rev 59092)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c	2013-08-13 00:17:39 UTC (rev 59093)
@@ -329,18 +329,15 @@
 		if (BM_elem_flag_test(e, BM_ELEM_SELECT)) bm->totedgesel -= 1;
 		BM_elem_flag_disable(e, BM_ELEM_SELECT);
 
-		if (bm->selectmode == SCE_SELECT_EDGE ||
-		    bm->selectmode == SCE_SELECT_FACE ||
-		    bm->selectmode == (SCE_SELECT_EDGE | SCE_SELECT_FACE))
-		{
-
+		if ((bm->selectmode & SCE_SELECT_VERTEX) == 0) {
 			BMIter iter;
 			BMVert *verts[2] = {e->v1, e->v2};
 			BMEdge *e2;
 			int i;
 
+			/* check if the vert is used by a selected edge */
 			for (i = 0; i < 2; i++) {
-				int deselect = 1;
+				bool deselect = true;
 
 				for (e2 = BM_iter_new(&iter, bm, BM_EDGES_OF_VERT, verts[i]); e2; e2 = BM_iter_step(&iter)) {
 					if (e2 == e) {
@@ -348,7 +345,7 @@
 					}
 
 					if (BM_elem_flag_test(e2, BM_ELEM_SELECT)) {
-						deselect = 0;
+						deselect = false;
 						break;
 					}
 				}




More information about the Bf-blender-cvs mailing list