From a12fa185f8b098d89e13afe476e1c34b40d21f29 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 28 Nov 2015 13:37:02 +1100 Subject: BMesh: use typed filter callbacks (const args too) --- source/blender/bmesh/intern/bmesh_construct.c | 4 ++-- source/blender/bmesh/intern/bmesh_construct.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/bmesh/intern') diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 7664108f348..3c2a85e9f52 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -116,7 +116,7 @@ BMFace *BM_face_create_quad_tri( */ void BM_face_copy_shared( BMesh *bm, BMFace *f, - BMElemFilterFunc filter_fn, void *user_data) + BMLoopFilterFunc filter_fn, void *user_data) { BMLoop *l_first; BMLoop *l_iter; @@ -149,7 +149,7 @@ void BM_face_copy_shared( for (j = 0; j < 2; j++) { BLI_assert(l_dst[j]->v == l_src[j]->v); if (BM_ELEM_API_FLAG_TEST(l_dst[j], _FLAG_OVERLAP) == 0) { - if ((filter_fn == NULL) || filter_fn((BMElem *)l_src[j], user_data)) { + if ((filter_fn == NULL) || filter_fn(l_src[j], user_data)) { bm_loop_attrs_copy(bm, bm, l_src[j], l_dst[j]); BM_ELEM_API_FLAG_ENABLE(l_dst[j], _FLAG_OVERLAP); } diff --git a/source/blender/bmesh/intern/bmesh_construct.h b/source/blender/bmesh/intern/bmesh_construct.h index 29503679547..ce8b8dd8391 100644 --- a/source/blender/bmesh/intern/bmesh_construct.h +++ b/source/blender/bmesh/intern/bmesh_construct.h @@ -38,7 +38,7 @@ BMFace *BM_face_create_quad_tri( void BM_face_copy_shared( BMesh *bm, BMFace *f, - BMElemFilterFunc filter_fn, void *user_data); + BMLoopFilterFunc filter_fn, void *user_data); BMFace *BM_face_create_ngon( BMesh *bm, BMVert *v1, BMVert *v2, BMEdge **edges, const int len, -- cgit v1.2.3