Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-06-19 22:59:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-06-19 22:59:54 +0400
commitd54d00ef845a7bb4f0d8e08133b2489983dbe907 (patch)
treeb95a9236b37fb5195100d3bfca19fe67152b342d /source/blender/editors/mesh/editmesh_utils.c
parent06e1bc6178fc22178b79763d392c8d58d06285fe (diff)
Remove paranoid null checks for editmesh EDBM_vert_at_index and friends (use asserts instead).
temp set BM_OMP_LIMIT to zero for better testing before release.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_utils.c')
-rw-r--r--source/blender/editors/mesh/editmesh_utils.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index ae2b25084bd..963b9cf134b 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -507,17 +507,20 @@ bool EDBM_index_arrays_check(BMEditMesh *em)
BMVert *EDBM_vert_at_index(BMEditMesh *em, int index)
{
- return em->vert_index && index < em->bm->totvert ? em->vert_index[index] : NULL;
+ BLI_assert((index >= 0) && (index < em->bm->totvert));
+ return em->vert_index[index];
}
BMEdge *EDBM_edge_at_index(BMEditMesh *em, int index)
{
- return em->edge_index && index < em->bm->totedge ? em->edge_index[index] : NULL;
+ BLI_assert((index >= 0) && (index < em->bm->totedge));
+ return em->edge_index[index];
}
BMFace *EDBM_face_at_index(BMEditMesh *em, int index)
{
- return (em->face_index && index < em->bm->totface && index >= 0) ? em->face_index[index] : NULL;
+ BLI_assert((index >= 0) && (index < em->bm->totface));
+ return em->face_index[index];
}
void EDBM_selectmode_flush_ex(BMEditMesh *em, const short selectmode)