Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct recent refactor (use generic callback)

Browse Source
This commit is contained in:
Campbell Barton
2014-11-06 11:47:08 +01:00
parent fb820c0638
commit 7d4c89e6da
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/bmesh/tools/bmesh_path.h
View File

@@ -29,14 +29,17 @@
struct LinkNode *BM_mesh_calc_path_vert(
BMesh *bm, BMVert *v_src, BMVert *v_dst, const bool use_length,
bool (*filter_fn)(BMVert *, void *), void *user_data);
bool (*filter_fn)(BMVert *, void *), void *user_data)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5);
struct LinkNode *BM_mesh_calc_path_edge(
BMesh *bm, BMEdge *e_src, BMEdge *e_dst, const bool use_length,
bool (*filter_fn)(BMEdge *, void *), void *user_data);
bool (*filter_fn)(BMEdge *, void *), void *user_data)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5);
struct LinkNode *BM_mesh_calc_path_face(
BMesh *bm, BMFace *f_src, BMFace *f_dst, const bool use_length,
bool (*test_fn)(BMFace *, void *), void *user_data);
bool (*test_fn)(BMFace *, void *), void *user_data)
ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3, 5);
#endif /* __BMESH_PATH_H__ */

11
source/blender/editors/mesh/editmesh_path.c
View File

@@ -513,11 +513,6 @@ void MESH_OT_shortest_path_pick(wmOperatorType *ot)
/* -------------------------------------------------------------------- */
/* Select path between existing selection */
static bool ele_filter_visible_cb(BMElem *ele, void *UNUSED(user_data))
{
return !BM_elem_flag_test(ele, BM_ELEM_HIDDEN);
}
static int edbm_shortest_path_select_exec(bContext *C, wmOperator *op)
{
Object *ob = CTX_data_edit_object(C);
@@ -577,17 +572,17 @@ static int edbm_shortest_path_select_exec(bContext *C, wmOperator *op)
case BM_VERT:
path = BM_mesh_calc_path_vert(
bm, (BMVert *)ele_src, (BMVert *)ele_dst, use_length,
NULL, (bool (*)(BMVert *, void *))ele_filter_visible_cb);
BM_elem_cb_check_hflag_disabled_simple(BMVert *, BM_ELEM_HIDDEN));
break;
case BM_EDGE:
path = BM_mesh_calc_path_edge(
bm, (BMEdge *)ele_src, (BMEdge *)ele_dst, use_length,
NULL, (bool (*)(BMEdge *, void *))ele_filter_visible_cb);
BM_elem_cb_check_hflag_disabled_simple(BMEdge *, BM_ELEM_HIDDEN));
break;
case BM_FACE:
path = BM_mesh_calc_path_face(
bm, (BMFace *)ele_src, (BMFace *)ele_dst, use_length,
NULL, (bool (*)(BMFace *, void *))ele_filter_visible_cb);
BM_elem_cb_check_hflag_disabled_simple(BMFace *, BM_ELEM_HIDDEN));
break;
}