[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53797] trunk/blender/source/blender/bmesh /intern/bmesh_iterators_inline.h: remove NULL checks for BM_iter_new() element iterators.
Campbell Barton
ideasman42 at gmail.com
Mon Jan 14 20:46:34 CET 2013
Revision: 53797
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53797
Author: campbellbarton
Date: 2013-01-14 19:46:30 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
remove NULL checks for BM_iter_new() element iterators. replace checks with assert().
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 2013-01-14 19:33:16 UTC (rev 53796)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h 2013-01-14 19:46:30 UTC (rev 53797)
@@ -77,91 +77,61 @@
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;
More information about the Bf-blender-cvs
mailing list