[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44218] branches/bmesh/blender/source/ blender: remove function for testing selection ( was only used in a few places)

Campbell Barton ideasman42 at gmail.com
Fri Feb 17 22:49:24 CET 2012


Revision: 44218
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44218
Author:   campbellbarton
Date:     2012-02-17 21:49:24 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
remove function for testing selection (was only used in a few places)

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h	2012-02-17 21:37:16 UTC (rev 44217)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h	2012-02-17 21:49:24 UTC (rev 44218)
@@ -42,11 +42,9 @@
 
 /* Selection code */
 void BM_elem_select_set(struct BMesh *bm, void *element, int select);
-/* I don't use this function anywhere, been using BM_elem_flag_test instead.
- * Need to decide either to keep it and convert everything over, or
- * chuck it.*/
-int BM_elem_select_test(BMesh *bm, const void *element);
 
+/* use BM_elem_flag_test(ele, BM_ELEM_SELECT) to test selection */
+
 void BM_mesh_elem_flag_enable_all(BMesh *bm, const char htype, const char hflag);
 void BM_mesh_elem_flag_disable_all(BMesh *bm, const char htype, const char hflag);
 

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-02-17 21:37:16 UTC (rev 44217)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-02-17 21:49:24 UTC (rev 44218)
@@ -626,7 +626,7 @@
 		return;
 
 	/* First we copy select */
-	if (BM_elem_select_test(source_mesh, source)) BM_elem_select_set(target_mesh, target, TRUE);
+	if (BM_elem_flag_test(source, BM_ELEM_SELECT)) BM_elem_select_set(target_mesh, target, TRUE);
 	
 	/* Now we copy flags */
 	theader->hflag = sheader->hflag;

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c	2012-02-17 21:37:16 UTC (rev 44217)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c	2012-02-17 21:49:24 UTC (rev 44218)
@@ -494,14 +494,6 @@
 	else if (head->htype == BM_FACE) BM_face_select_set(bm, (BMFace *)element, select);
 }
 
-int BM_elem_select_test(BMesh *UNUSED(bm), const void *element)
-{
-	const BMHeader *head = element;
-	int selected = BM_elem_flag_test(head, BM_ELEM_SELECT);
-	BLI_assert(!selected || !BM_elem_flag_test(head, BM_ELEM_HIDDEN));
-	return selected;
-}
-
 /* this replaces the active flag used in uv/face mode */
 void BM_active_face_set(BMesh *bm, BMFace *efa)
 {

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2012-02-17 21:37:16 UTC (rev 44217)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2012-02-17 21:49:24 UTC (rev 44218)
@@ -3110,7 +3110,7 @@
 
 	/* store percentage of edge cut for KNIFE_EXACT here.*/
 	for (be = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL); be; be = BM_iter_step(&iter)) {
-		if (BM_elem_select_test(bm, be)) {
+		if (BM_elem_flag_test(be, BM_ELEM_SELECT)) {
 			isect = bm_edge_seg_isect(be, curve, len, mode, gh, &isected);
 			
 			if (isect != 0.0f) {

Modified: branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c	2012-02-17 21:37:16 UTC (rev 44217)
+++ branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c	2012-02-17 21:49:24 UTC (rev 44218)
@@ -1956,7 +1956,7 @@
 	BMIter iter;
 
 	BM_ITER(efa, &iter, bm, BM_FACES_OF_VERT, eve) {
-		if (BM_elem_select_test(bm, efa)) {
+		if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 			BM_face_center_mean_calc(bm, efa, cent_r);
 			break;
 		}
@@ -1969,7 +1969,7 @@
 	BMIter iter;
 
 	BM_ITER(eed, &iter, bm, BM_EDGES_OF_VERT, eve) {
-		if (BM_elem_select_test(bm, eed)) {
+		if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 			mid_v3_v3v3(cent_r, eed->v1->co, eed->v2->co);
 			break;
 		}
@@ -2049,7 +2049,7 @@
 	// transform now requires awareness for select mode, so we tag the f1 flags in verts
 	if(selectmode & SCE_SELECT_VERTEX) {
 		BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
-			if (BM_elem_select_test(bm, eve)) {
+			if (BM_elem_flag_test(eve, BM_ELEM_SELECT)) {
 				BM_elem_flag_enable(eve, BM_ELEM_TAG);
 			}
 			else {
@@ -2065,7 +2065,7 @@
 
 		eed = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL);
 		for( ; eed; eed=BM_iter_step(&iter)) {
-			if (BM_elem_select_test(bm, eed)) {
+			if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
 				BM_elem_flag_enable(eed->v1, BM_ELEM_TAG);
 				BM_elem_flag_enable(eed->v2, BM_ELEM_TAG);
 			}
@@ -2078,7 +2078,7 @@
 
 		efa = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL);
 		for( ; efa; efa=BM_iter_step(&iter)) {
-			if (BM_elem_select_test(bm, efa)) {
+			if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
 				BMIter liter;
 				BMLoop *l;
 




More information about the Bf-blender-cvs mailing list