diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-11-13 20:10:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-11-13 20:33:35 +0300 |
| commit | fc9fa07c0e177bda4c5ae2233616081ed48f2c8c (patch) | |
| tree | 09daf8254b0ed0035032f841483a462ee6ec2c9a /source/blender/bmesh/intern/bmesh_core.c | |
| parent | 1b1d6ce131c93b8a770c873460dce429796849a3 (diff) | |
BMesh: BM_face_exists no longer uses return arg
Just return the face or NULL, like BM_edge_exists(),
Also for BM_face_exists_overlap & bm_face_exists_tri_from_loop_vert.
No functional changes.
Old code did some partial overlap checks where this made some sense,
but it's since been removed.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_core.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index a7e1aa7fb07..0460a33494c 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -444,13 +444,10 @@ BMFace *BM_face_create( if (create_flag & BM_CREATE_NO_DOUBLE) { /* Check if face already exists */ - const bool is_overlap = BM_face_exists(verts, len, &f); - if (is_overlap) { + f = BM_face_exists(verts, len); + if (f != NULL) { return f; } - else { - BLI_assert(f == NULL); - } } f = bm_face_create__internal(bm); |