From 590f58d45583f36522ffbcebd68b4a6c921bebeb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 8 Oct 2013 20:18:38 +0000 Subject: code cleanup: redundant includes and add minor comments. --- source/blender/bmesh/intern/bmesh_core.c | 3 ++- source/blender/bmesh/intern/bmesh_polygon.c | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'source/blender/bmesh/intern') diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 0b14cf22276..8441a6ec75f 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -2282,7 +2282,8 @@ BMVert *bmesh_urmv(BMesh *bm, BMFace *f_sep, BMVert *v_sep) /** * Avoid calling this where possible, - * low level function for swapping faces. + * low level function so both face pointers remain intact but point to swapped data. + * \note must be from the same bmesh. */ void bmesh_face_swap_data(BMesh *bm, BMFace *f_a, BMFace *f_b) { diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index d11ae82b3d2..1dfd2535913 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -30,8 +30,6 @@ #include "DNA_listBase.h" -#include "MEM_guardedalloc.h" - #include "BLI_alloca.h" #include "BLI_math.h" #include "BLI_memarena.h" @@ -833,10 +831,6 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, f_new = BM_face_split(bm, f, l_first->v, l_first->next->next->v, &l_new, NULL, false); copy_v3_v3(f_new->no, f->no); - if (UNLIKELY(!l_new || !f_new)) { - fprintf(stderr, "%s: triangulator failed to split face! (bmesh internal error)\n", __func__); - } - if (use_tag) { BM_elem_flag_enable(l_new->e, BM_ELEM_TAG); BM_elem_flag_enable(f, BM_ELEM_TAG); @@ -905,13 +899,15 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, BM_elem_flag_enable(l_new->e, BM_ELEM_TAG); } + /* add all but the last face which is swapped and removed (below) */ if (r_faces_new && sf_tri->prev) { r_faces_new[nf_i++] = f_new; } } if (sf_ctx.fillfacebase.first) { - /* we can't delete the real face, so swap data and delete */ + /* we can't delete the real face, because some of the callers expect it to remain valid. + * so swap data and delete the last created tri */ bmesh_face_swap_data(bm, f, f_new); BM_face_kill(bm, f_new); -- cgit v1.2.3