From c8db1e832d26e7b34ace2f36ff66b40d1195cb7c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 20 Jul 2012 09:49:54 +0000 Subject: minor edits for bmesh api --- source/blender/bmesh/intern/bmesh_marking.c | 11 ++++++++--- source/blender/bmesh/intern/bmesh_marking.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 4588fbae383..d16dacaf5cf 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -71,7 +71,7 @@ static void recount_totsels(BMesh *bm) * (ie: all verts of an edge selects the edge and so on). * This should only be called by system and not tool authors. */ -void BM_mesh_select_mode_flush(BMesh *bm) +void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode) { BMEdge *e; BMLoop *l_iter; @@ -83,7 +83,7 @@ void BM_mesh_select_mode_flush(BMesh *bm) int ok; - if (bm->selectmode & SCE_SELECT_VERTEX) { + if (selectmode & SCE_SELECT_VERTEX) { BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) && BM_elem_flag_test(e->v2, BM_ELEM_SELECT) && @@ -113,7 +113,7 @@ void BM_mesh_select_mode_flush(BMesh *bm) BM_elem_flag_set(f, BM_ELEM_SELECT, ok); } } - else if (bm->selectmode & SCE_SELECT_EDGE) { + else if (selectmode & SCE_SELECT_EDGE) { BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { ok = TRUE; if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { @@ -139,6 +139,11 @@ void BM_mesh_select_mode_flush(BMesh *bm) recount_totsels(bm); } +void BM_mesh_select_mode_flush(BMesh *bm) +{ + BM_mesh_select_mode_flush_ex(bm, bm->selectmode); +} + /** * mode independent flushing up/down */ diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h index 406971652dc..9b73ed2c390 100644 --- a/source/blender/bmesh/intern/bmesh_marking.h +++ b/source/blender/bmesh/intern/bmesh_marking.h @@ -60,6 +60,7 @@ void BM_edge_select_set(BMesh *bm, BMEdge *e, int select); void BM_face_select_set(BMesh *bm, BMFace *f, int select); void BM_mesh_select_mode_set(BMesh *bm, int selectmode); +void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode); void BM_mesh_select_mode_flush(BMesh *bm); void BM_mesh_deselect_flush(BMesh *bm); -- cgit v1.2.3