remove NULL checks for BM_iter_new() element iterators. replace checks with assert().

1 files changed, 10 insertions, 40 deletions

diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.h
index 5bac3eb458f..d9784ac9b2a 100644
--- a/source/blender/bmesh/intern/bmesh_iterators_inline.h
+++ b/source/blender/bmesh/intern/bmesh_iterators_inline.h
@@ -77,91 +77,61 @@ BLI_INLINE bool BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *da
 			iter->step =  bmiter__face_of_mesh_step;
 			break;
 		case BM_EDGES_OF_VERT:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__edge_of_vert_begin;
 			iter->step =  bmiter__edge_of_vert_step;
 			iter->vdata = data;
 			break;
 		case BM_FACES_OF_VERT:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__face_of_vert_begin;
 			iter->step =  bmiter__face_of_vert_step;
 			iter->vdata = data;
 			break;
 		case BM_LOOPS_OF_VERT:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__loop_of_vert_begin;
 			iter->step =  bmiter__loop_of_vert_step;
 			iter->vdata = data;
 			break;
 		case BM_VERTS_OF_EDGE:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__vert_of_edge_begin;
 			iter->step =  bmiter__vert_of_edge_step;
 			iter->edata = data;
 			break;
 		case BM_FACES_OF_EDGE:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__face_of_edge_begin;
 			iter->step =  bmiter__face_of_edge_step;
 			iter->edata = data;
 			break;
 		case BM_VERTS_OF_FACE:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__vert_of_face_begin;
 			iter->step =  bmiter__vert_of_face_step;
 			iter->pdata = data;
 			break;
 		case BM_EDGES_OF_FACE:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__edge_of_face_begin;
 			iter->step =  bmiter__edge_of_face_step;
 			iter->pdata = data;
 			break;
 		case BM_LOOPS_OF_FACE:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__loop_of_face_begin;
 			iter->step =  bmiter__loop_of_face_step;
 			iter->pdata = data;
 			break;
 		case BM_LOOPS_OF_LOOP:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__loops_of_loop_begin;
 			iter->step =  bmiter__loops_of_loop_step;
 			iter->ldata = data;
 			break;
 		case BM_LOOPS_OF_EDGE:
-			if (UNLIKELY(!data)) {
-				return false;
-			}
-
+			BLI_assert(data != NULL);
 			iter->begin = bmiter__loops_of_edge_begin;
 			iter->step =  bmiter__loops_of_edge_step;
 			iter->edata = data;