[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45797] trunk/blender/source/blender/bmesh /intern/bmesh_iterators_inline.h: add asserts for invalid iteratpr values so we can catch them in debug mode .

Campbell Barton ideasman42 at gmail.com
Fri Apr 20 00:40:10 CEST 2012


Revision: 45797
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45797
Author:   campbellbarton
Date:     2012-04-19 22:40:09 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
add asserts for invalid iteratpr values so we can catch them in debug mode.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h	2012-04-19 21:47:32 UTC (rev 45796)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h	2012-04-19 22:40:09 UTC (rev 45797)
@@ -59,14 +59,20 @@
 	/* inlining optimizes out this switch when called with the defined type */
 	switch ((BMIterType)itype) {
 		case BM_VERTS_OF_MESH:
+			BLI_assert(bm != NULL);
+			BLI_assert(data == NULL);
 			iter->begin = bmiter__vert_of_mesh_begin;
 			iter->step =  bmiter__vert_of_mesh_step;
 			break;
 		case BM_EDGES_OF_MESH:
+			BLI_assert(bm != NULL);
+			BLI_assert(data == NULL);
 			iter->begin = bmiter__edge_of_mesh_begin;
 			iter->step =  bmiter__edge_of_mesh_step;
 			break;
 		case BM_FACES_OF_MESH:
+			BLI_assert(bm != NULL);
+			BLI_assert(data == NULL);
 			iter->begin = bmiter__face_of_mesh_begin;
 			iter->step =  bmiter__face_of_mesh_step;
 			break;
@@ -161,6 +167,8 @@
 			iter->edata = data;
 			break;
 		default:
+			/* should never happen */
+			BLI_assert(0);
 			return FALSE;
 			break;
 	}




More information about the Bf-blender-cvs mailing list