From 2115232a16d81d28dbdb8042ed8e9316858514c6 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 4 Sep 2020 20:59:13 +0200 Subject: Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix No functional changes --- source/blender/bmesh/intern/bmesh_construct.c | 34 +++++++++++------------ source/blender/bmesh/intern/bmesh_core.c | 12 ++++---- source/blender/bmesh/intern/bmesh_core.h | 10 +++---- source/blender/bmesh/intern/bmesh_edgeloop.h | 2 +- source/blender/bmesh/intern/bmesh_marking.c | 4 +-- source/blender/bmesh/intern/bmesh_marking.h | 4 +-- source/blender/bmesh/intern/bmesh_mesh.h | 8 +++--- source/blender/bmesh/intern/bmesh_mods.h | 2 +- source/blender/bmesh/intern/bmesh_operator_api.h | 2 +- source/blender/bmesh/intern/bmesh_polygon.h | 14 +++++----- source/blender/bmesh/intern/bmesh_query.c | 12 ++++---- source/blender/bmesh/intern/bmesh_query.h | 4 +-- source/blender/bmesh/tools/bmesh_path_region.h | 6 ++-- source/blender/bmesh/tools/bmesh_path_region_uv.h | 6 ++-- source/blender/bmesh/tools/bmesh_triangulate.h | 2 +- 15 files changed, 61 insertions(+), 61 deletions(-) (limited to 'source/blender/bmesh') diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 0d79d60e5c1..81494b03558 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -725,45 +725,45 @@ BMesh *BM_mesh_copy(BMesh *bm_old) } /* ME -> BM */ -char BM_vert_flag_from_mflag(const char meflag) +char BM_vert_flag_from_mflag(const char mflag) { - return (((meflag & SELECT) ? BM_ELEM_SELECT : 0) | ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)); + return (((mflag & SELECT) ? BM_ELEM_SELECT : 0) | ((mflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)); } -char BM_edge_flag_from_mflag(const short meflag) +char BM_edge_flag_from_mflag(const short mflag) { - return (((meflag & SELECT) ? BM_ELEM_SELECT : 0) | ((meflag & ME_SEAM) ? BM_ELEM_SEAM : 0) | - ((meflag & ME_EDGEDRAW) ? BM_ELEM_DRAW : 0) | - ((meflag & ME_SHARP) == 0 ? BM_ELEM_SMOOTH : 0) | /* invert */ - ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)); + return (((mflag & SELECT) ? BM_ELEM_SELECT : 0) | ((mflag & ME_SEAM) ? BM_ELEM_SEAM : 0) | + ((mflag & ME_EDGEDRAW) ? BM_ELEM_DRAW : 0) | + ((mflag & ME_SHARP) == 0 ? BM_ELEM_SMOOTH : 0) | /* invert */ + ((mflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)); } -char BM_face_flag_from_mflag(const char meflag) +char BM_face_flag_from_mflag(const char mflag) { - return (((meflag & ME_FACE_SEL) ? BM_ELEM_SELECT : 0) | - ((meflag & ME_SMOOTH) ? BM_ELEM_SMOOTH : 0) | ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)); + return (((mflag & ME_FACE_SEL) ? BM_ELEM_SELECT : 0) | + ((mflag & ME_SMOOTH) ? BM_ELEM_SMOOTH : 0) | ((mflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0)); } /* BM -> ME */ -char BM_vert_flag_to_mflag(BMVert *eve) +char BM_vert_flag_to_mflag(BMVert *v) { - const char hflag = eve->head.hflag; + const char hflag = v->head.hflag; return (((hflag & BM_ELEM_SELECT) ? SELECT : 0) | ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0)); } -short BM_edge_flag_to_mflag(BMEdge *eed) +short BM_edge_flag_to_mflag(BMEdge *e) { - const char hflag = eed->head.hflag; + const char hflag = e->head.hflag; return (((hflag & BM_ELEM_SELECT) ? SELECT : 0) | ((hflag & BM_ELEM_SEAM) ? ME_SEAM : 0) | ((hflag & BM_ELEM_DRAW) ? ME_EDGEDRAW : 0) | ((hflag & BM_ELEM_SMOOTH) == 0 ? ME_SHARP : 0) | ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0) | - ((BM_edge_is_wire(eed)) ? ME_LOOSEEDGE : 0) | /* not typical */ + ((BM_edge_is_wire(e)) ? ME_LOOSEEDGE : 0) | /* not typical */ ME_EDGERENDER); } -char BM_face_flag_to_mflag(BMFace *efa) +char BM_face_flag_to_mflag(BMFace *f) { - const char hflag = efa->head.hflag; + const char hflag = f->head.hflag; return (((hflag & BM_ELEM_SELECT) ? ME_FACE_SEL : 0) | ((hflag & BM_ELEM_SMOOTH) ? ME_SMOOTH : 0) | ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0)); diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 6c4f98e125f..32ca90f5c13 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1804,7 +1804,7 @@ BMEdge *bmesh_kernel_join_edge_kill_vert(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool do_del, - const bool check_edge_double, + const bool check_edge_exists, const bool kill_degenerate_faces) { BMEdge *e_old; @@ -1846,7 +1846,7 @@ BMEdge *bmesh_kernel_join_edge_kill_vert(BMesh *bm, valence2 = bmesh_disk_count(v_target); #endif - if (check_edge_double) { + if (check_edge_exists) { e_splice = BM_edge_exists(v_target, v_old); } @@ -1926,7 +1926,7 @@ BMEdge *bmesh_kernel_join_edge_kill_vert(BMesh *bm, BM_CHECK_ELEMENT(l->f); } #endif - if (check_edge_double) { + if (check_edge_exists) { if (e_splice) { /* removes e_splice */ BM_edge_splice(bm, e_old, e_splice); @@ -1971,7 +1971,7 @@ BMVert *bmesh_kernel_join_vert_kill_edge(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool do_del, - const bool check_edge_double, + const bool check_edge_exists, const bool kill_degenerate_faces) { BLI_SMALLSTACK_DECLARE(faces_degenerate, BMFace *); @@ -2020,14 +2020,14 @@ BMVert *bmesh_kernel_join_vert_kill_edge(BMesh *bm, while ((e = v_kill->e)) { BMEdge *e_target; - if (check_edge_double) { + if (check_edge_exists) { e_target = BM_edge_exists(v_target, BM_edge_other_vert(e, v_kill)); } bmesh_edge_vert_swap(e, v_target, v_kill); BLI_assert(e->v1 != e->v2); - if (check_edge_double) { + if (check_edge_exists) { if (e_target) { BM_edge_splice(bm, e_target, e); } diff --git a/source/blender/bmesh/intern/bmesh_core.h b/source/blender/bmesh/intern/bmesh_core.h index 0e19437a527..df73984e6cf 100644 --- a/source/blender/bmesh/intern/bmesh_core.h +++ b/source/blender/bmesh/intern/bmesh_core.h @@ -46,7 +46,7 @@ BMFace *BM_face_create(BMesh *bm, const BMFace *f_example, const eBMCreateFlag create_flag); BMFace *BM_face_create_verts(BMesh *bm, - BMVert **verts, + BMVert **vert_arr, const int len, const BMFace *f_example, const eBMCreateFlag create_flag, @@ -100,8 +100,8 @@ void bmesh_kernel_edge_separate(BMesh *bm, BMEdge *e, BMLoop *l_sep, const bool BMFace *bmesh_kernel_split_face_make_edge(BMesh *bm, BMFace *f, - BMLoop *l1, - BMLoop *l2, + BMLoop *l_v1, + BMLoop *l_v2, BMLoop **r_l, #ifdef USE_BMESH_HOLES ListBase *holes, @@ -114,13 +114,13 @@ BMEdge *bmesh_kernel_join_edge_kill_vert(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool do_del, - const bool check_edge_splice, + const bool check_edge_exists, const bool kill_degenerate_faces); BMVert *bmesh_kernel_join_vert_kill_edge(BMesh *bm, BMEdge *e_kill, BMVert *v_kill, const bool do_del, - const bool check_edge_double, + const bool check_edge_exists, const bool kill_degenerate_faces); BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e); diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.h b/source/blender/bmesh/intern/bmesh_edgeloop.h index 2e5c4d0193e..ac24389d455 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.h +++ b/source/blender/bmesh/intern/bmesh_edgeloop.h @@ -29,7 +29,7 @@ struct ListBase; /* multiple edgeloops (ListBase) */ int BM_mesh_edgeloops_find(BMesh *bm, - struct ListBase *r_lb, + struct ListBase *r_eloops, bool (*test_fn)(BMEdge *, void *user_data), void *user_data); bool BM_mesh_edgeloops_find_path(BMesh *bm, diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 5b8fe1f492e..61df8cf0c25 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -733,9 +733,9 @@ void BM_elem_select_set(BMesh *bm, BMElem *ele, const bool select) } /* this replaces the active flag used in uv/face mode */ -void BM_mesh_active_face_set(BMesh *bm, BMFace *efa) +void BM_mesh_active_face_set(BMesh *bm, BMFace *f) { - bm->act_face = efa; + bm->act_face = f; } BMFace *BM_mesh_active_face_get(BMesh *bm, const bool is_sloppy, const bool is_selected) diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h index 958980bdc23..04a49e24757 100644 --- a/source/blender/bmesh/intern/bmesh_marking.h +++ b/source/blender/bmesh/intern/bmesh_marking.h @@ -28,7 +28,7 @@ typedef struct BMEditSelection { /* geometry hiding code */ #define BM_elem_hide_set(bm, ele, hide) _bm_elem_hide_set(bm, &(ele)->head, hide) -void _bm_elem_hide_set(BMesh *bm, BMHeader *ele, const bool hide); +void _bm_elem_hide_set(BMesh *bm, BMHeader *head, const bool hide); void BM_vert_hide_set(BMVert *v, const bool hide); void BM_edge_hide_set(BMEdge *e, const bool hide); void BM_face_hide_set(BMFace *f, const bool hide); @@ -66,7 +66,7 @@ void BM_face_select_set(BMesh *bm, BMFace *f, const bool select); /* lower level functions which don't do flushing */ void BM_edge_select_set_noflush(BMesh *bm, BMEdge *e, const bool select); -void BM_face_select_set_noflush(BMesh *bm, BMFace *e, const bool select); +void BM_face_select_set_noflush(BMesh *bm, BMFace *f, const bool select); void BM_mesh_select_mode_clean_ex(BMesh *bm, const short selectmode); void BM_mesh_select_mode_clean(BMesh *bm); diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h index a6b8b629ddf..c1c2f17d7c1 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.h +++ b/source/blender/bmesh/intern/bmesh_mesh.h @@ -48,7 +48,7 @@ void BM_verts_calc_normal_vcos(BMesh *bm, void BM_loops_calc_normal_vcos(BMesh *bm, const float (*vcos)[3], const float (*vnos)[3], - const float (*pnos)[3], + const float (*fnos)[3], const bool use_split_normals, const float split_angle, float (*r_lnos)[3], @@ -81,7 +81,7 @@ void bmesh_edit_begin(BMesh *bm, const BMOpTypeFlag type_flag); void bmesh_edit_end(BMesh *bm, const BMOpTypeFlag type_flag); void BM_mesh_elem_index_ensure_ex(BMesh *bm, const char htype, int elem_offset[4]); -void BM_mesh_elem_index_ensure(BMesh *bm, const char hflag); +void BM_mesh_elem_index_ensure(BMesh *bm, const char htype); void BM_mesh_elem_index_validate( BMesh *bm, const char *location, const char *func, const char *msg_a, const char *msg_b); @@ -164,9 +164,9 @@ extern const BMAllocTemplate bm_mesh_chunksize_default; VA_NARGS_CALL_OVERLOAD(_VA_BMALLOC_TEMPLATE_FROM_ME_, __VA_ARGS__) /* Vertex coords access. */ -void BM_mesh_vert_coords_get(BMesh *bm, float (*orco)[3]); +void BM_mesh_vert_coords_get(BMesh *bm, float (*vert_coords)[3]); float (*BM_mesh_vert_coords_alloc(BMesh *bm, int *r_vert_len))[3]; -void BM_mesh_vert_coords_apply(BMesh *bm, const float (*orco)[3]); +void BM_mesh_vert_coords_apply(BMesh *bm, const float (*vert_coords)[3]); void BM_mesh_vert_coords_apply_with_mat4(BMesh *bm, const float (*vert_coords)[3], const float mat[4][4]); diff --git a/source/blender/bmesh/intern/bmesh_mods.h b/source/blender/bmesh/intern/bmesh_mods.h index 8099d1dd603..46186306fec 100644 --- a/source/blender/bmesh/intern/bmesh_mods.h +++ b/source/blender/bmesh/intern/bmesh_mods.h @@ -64,7 +64,7 @@ BMVert *BM_edge_collapse(BMesh *bm, const bool do_del, const bool kill_degenerate_faces); -BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float percent); +BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float fac); BMVert *BM_edge_split_n(BMesh *bm, BMEdge *e, int numcuts, BMVert **r_varr); diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.h index a9282b8e5d0..706979abeba 100644 --- a/source/blender/bmesh/intern/bmesh_operator_api.h +++ b/source/blender/bmesh/intern/bmesh_operator_api.h @@ -575,7 +575,7 @@ void BMO_slot_map_insert(BMOperator *op, BMOpSlot *slot, const void *element, co void BMO_slot_map_to_flag(BMesh *bm, BMOpSlot slot_args[BMO_OP_MAX_SLOTS], const char *slot_name, - const char hflag, + const char htype, const short oflag); void *BMO_slot_buffer_alloc(BMOperator *op, diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index d9413e303e3..8c2b9ee0bff 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -53,12 +53,12 @@ float BM_face_calc_perimeter(const BMFace *f) ATTR_WARN_UNUSED_RESULT ATTR_NONNU float BM_face_calc_perimeter_with_mat3(const BMFace *f, const float mat3[3][3]) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -void BM_face_calc_tangent_edge(const BMFace *f, float r_plane[3]) ATTR_NONNULL(); -void BM_face_calc_tangent_edge_pair(const BMFace *f, float r_plane[3]) ATTR_NONNULL(); -void BM_face_calc_tangent_edge_diagonal(const BMFace *f, float r_plane[3]) ATTR_NONNULL(); -void BM_face_calc_tangent_vert_diagonal(const BMFace *f, float r_plane[3]) ATTR_NONNULL(); -void BM_face_calc_tangent_auto(const BMFace *f, float r_plane[3]) ATTR_NONNULL(); -void BM_face_calc_center_bounds(const BMFace *f, float center[3]) ATTR_NONNULL(); +void BM_face_calc_tangent_edge(const BMFace *f, float r_tangent[3]) ATTR_NONNULL(); +void BM_face_calc_tangent_edge_pair(const BMFace *f, float r_tangent[3]) ATTR_NONNULL(); +void BM_face_calc_tangent_edge_diagonal(const BMFace *f, float r_tangent[3]) ATTR_NONNULL(); +void BM_face_calc_tangent_vert_diagonal(const BMFace *f, float r_tangent[3]) ATTR_NONNULL(); +void BM_face_calc_tangent_auto(const BMFace *f, float r_tangent[3]) ATTR_NONNULL(); +void BM_face_calc_center_bounds(const BMFace *f, float r_cent[3]) ATTR_NONNULL(); void BM_face_calc_center_bounds_vcos(const BMesh *bm, const BMFace *f, float r_center[3], @@ -68,7 +68,7 @@ void BM_face_calc_center_median_vcos(const BMesh *bm, const BMFace *f, float r_center[3], float const (*vertexCos)[3]) ATTR_NONNULL(); -void BM_face_calc_center_median_weighted(const BMFace *f, float center[3]) ATTR_NONNULL(); +void BM_face_calc_center_median_weighted(const BMFace *f, float r_cent[3]) ATTR_NONNULL(); void BM_face_calc_bounds_expand(const BMFace *f, float min[3], float max[3]); diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index 61a81e56a2e..e102c1fe41c 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -1187,16 +1187,16 @@ bool BM_vert_is_boundary(const BMVert *v) * \note Could be sped up a bit by not using iterators and by tagging * faces on either side, then count the tags rather then searching. */ -int BM_face_share_face_count(BMFace *f1, BMFace *f2) +int BM_face_share_face_count(BMFace *f_a, BMFace *f_b) { BMIter iter1, iter2; BMEdge *e; BMFace *f; int count = 0; - BM_ITER_ELEM (e, &iter1, f1, BM_EDGES_OF_FACE) { + BM_ITER_ELEM (e, &iter1, f_a, BM_EDGES_OF_FACE) { BM_ITER_ELEM (f, &iter2, e, BM_FACES_OF_EDGE) { - if (f != f1 && f != f2 && BM_face_share_edge_check(f, f2)) { + if (f != f_a && f != f_b && BM_face_share_edge_check(f, f_b)) { count++; } } @@ -1208,15 +1208,15 @@ int BM_face_share_face_count(BMFace *f1, BMFace *f2) /** * same as #BM_face_share_face_count but returns a bool */ -bool BM_face_share_face_check(BMFace *f1, BMFace *f2) +bool BM_face_share_face_check(BMFace *f_a, BMFace *f_b) { BMIter iter1, iter2; BMEdge *e; BMFace *f; - BM_ITER_ELEM (e, &iter1, f1, BM_EDGES_OF_FACE) { + BM_ITER_ELEM (e, &iter1, f_a, BM_EDGES_OF_FACE) { BM_ITER_ELEM (f, &iter2, e, BM_FACES_OF_EDGE) { - if (f != f1 && f != f2 && BM_face_share_edge_check(f, f2)) { + if (f != f_a && f != f_b && BM_face_share_edge_check(f, f_b)) { return true; } } diff --git a/source/blender/bmesh/intern/bmesh_query.h b/source/blender/bmesh/intern/bmesh_query.h index 1ff2558ce83..d2c71d8c71d 100644 --- a/source/blender/bmesh/intern/bmesh_query.h +++ b/source/blender/bmesh/intern/bmesh_query.h @@ -153,7 +153,7 @@ float BM_loop_calc_face_normal_safe_vcos(const BMLoop *l, float const (*vertexCos)[3], float r_normal[3]) ATTR_NONNULL(); -void BM_loop_calc_face_direction(const BMLoop *l, float r_normal[3]); +void BM_loop_calc_face_direction(const BMLoop *l, float r_dir[3]); void BM_loop_calc_face_tangent(const BMLoop *l, float r_tangent[3]); float BM_edge_calc_face_angle_ex(const BMEdge *e, const float fallback) ATTR_WARN_UNUSED_RESULT @@ -185,7 +185,7 @@ float BM_vert_calc_median_tagged_edge_length(const BMVert *v) ATTR_WARN_UNUSED_R BMLoop *BM_face_find_shortest_loop(BMFace *f) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMLoop *BM_face_find_longest_loop(BMFace *f) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -BMEdge *BM_edge_exists(BMVert *v1, BMVert *v2) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +BMEdge *BM_edge_exists(BMVert *v_a, BMVert *v_b) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMEdge *BM_edge_find_double(BMEdge *e) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMFace *BM_face_exists(BMVert **varr, int len) ATTR_NONNULL(1); diff --git a/source/blender/bmesh/tools/bmesh_path_region.h b/source/blender/bmesh/tools/bmesh_path_region.h index 99a5b4a0960..2badead33a0 100644 --- a/source/blender/bmesh/tools/bmesh_path_region.h +++ b/source/blender/bmesh/tools/bmesh_path_region.h @@ -23,20 +23,20 @@ struct LinkNode *BM_mesh_calc_path_region_vert(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, - bool (*test_fn)(BMVert *, void *user_data), + bool (*filter_fn)(BMVert *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); struct LinkNode *BM_mesh_calc_path_region_edge(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, - bool (*test_fn)(BMEdge *, void *user_data), + bool (*filter_fn)(BMEdge *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); struct LinkNode *BM_mesh_calc_path_region_face(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, - bool (*test_fn)(BMFace *, void *user_data), + bool (*filter_fn)(BMFace *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); diff --git a/source/blender/bmesh/tools/bmesh_path_region_uv.h b/source/blender/bmesh/tools/bmesh_path_region_uv.h index 18fe977c9fa..5767c5384e5 100644 --- a/source/blender/bmesh/tools/bmesh_path_region_uv.h +++ b/source/blender/bmesh/tools/bmesh_path_region_uv.h @@ -24,7 +24,7 @@ struct LinkNode *BM_mesh_calc_path_uv_region_vert(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, const uint cd_loop_uv_offset, - bool (*test_fn)(BMLoop *, void *user_data), + bool (*filter_fn)(BMLoop *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); @@ -32,7 +32,7 @@ struct LinkNode *BM_mesh_calc_path_uv_region_edge(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, const uint cd_loop_uv_offset, - bool (*test_fn)(BMLoop *, void *user_data), + bool (*filter_fn)(BMLoop *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); @@ -40,6 +40,6 @@ struct LinkNode *BM_mesh_calc_path_uv_region_face(BMesh *bm, BMElem *ele_src, BMElem *ele_dst, const uint cd_loop_uv_offset, - bool (*test_fn)(BMFace *, void *user_data), + bool (*filter_fn)(BMFace *, void *user_data), void *user_data) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2, 3); diff --git a/source/blender/bmesh/tools/bmesh_triangulate.h b/source/blender/bmesh/tools/bmesh_triangulate.h index 5353b315a38..f45f94f15d8 100644 --- a/source/blender/bmesh/tools/bmesh_triangulate.h +++ b/source/blender/bmesh/tools/bmesh_triangulate.h @@ -29,4 +29,4 @@ void BM_mesh_triangulate(BMesh *bm, const bool tag_only, BMOperator *op, BMOpSlot *slot_facemap_out, - BMOpSlot *slot_doubles_out); + BMOpSlot *slot_facemap_double_out); -- cgit v1.2.3