[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44962] trunk/blender/source/blender/bmesh /intern/bmesh_marking.c: fix for own mistake when refactoring bmesh - was treating the iterator as a type flag .

Campbell Barton ideasman42 at gmail.com
Sun Mar 18 10:21:29 CET 2012


Revision: 44962
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44962
Author:   campbellbarton
Date:     2012-03-18 09:21:24 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
fix for own mistake when refactoring bmesh - was treating the iterator as a type flag.

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	2012-03-18 07:38:51 UTC (rev 44961)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_marking.c	2012-03-18 09:21:24 UTC (rev 44962)
@@ -755,6 +755,9 @@
 	const char iter_types[3] = {BM_VERTS_OF_MESH,
 	                            BM_EDGES_OF_MESH,
 	                            BM_FACES_OF_MESH};
+
+	const char flag_types[3] = {BM_VERT, BM_EDGE, BM_FACE};
+
 	BMIter iter;
 	BMElem *ele;
 	int i;
@@ -776,7 +779,7 @@
 	}
 	else {
 		for (i = 0; i < 3; i++) {
-			if (htype & iter_types[i]) {
+			if (htype & flag_types[i]) {
 				ele = BM_iter_new(&iter, bm, iter_types[i], NULL);
 				for ( ; ele; ele = BM_iter_step(&iter)) {
 					if (hflag & BM_ELEM_SELECT) {
@@ -794,6 +797,9 @@
 	const char iter_types[3] = {BM_VERTS_OF_MESH,
 	                            BM_EDGES_OF_MESH,
 	                            BM_FACES_OF_MESH};
+
+	const char flag_types[3] = {BM_VERT, BM_EDGE, BM_FACE};
+
 	BMIter iter;
 	BMElem *ele;
 	int i;
@@ -807,7 +813,7 @@
 	 * we could ofcourse check for no hiddent faces and then use quicker method but its not worth it. */
 
 	for (i = 0; i < 3; i++) {
-		if (htype & iter_types[i]) {
+		if (htype & flag_types[i]) {
 			ele = BM_iter_new(&iter, bm, iter_types[i], NULL);
 			for ( ; ele; ele = BM_iter_step(&iter)) {
 				if (hflag & BM_ELEM_SELECT) {




More information about the Bf-blender-cvs mailing list