diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 02:54:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 02:54:11 +0300 |
| commit | 6e2d9ef2db3776cf5f6f8a8f685da0aa668f9ae6 (patch) | |
| tree | 0b3a2f77199fc4bb6d366f6f9248bab2267046a3 /source/blender/bmesh/tools | |
| parent | e961c1244c9737c3c693034272c67817f82b0404 (diff) | |
Cleanup: naming (mean -> median) see T47811
Diffstat (limited to 'source/blender/bmesh/tools')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_path.c | 10 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_wireframe.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 2faf6b81461..e7e42e4bd01 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -100,7 +100,7 @@ static void bm_decim_build_quadrics(BMesh *bm, Quadric *vquadrics) double plane_db[4]; Quadric q; - BM_face_calc_center_mean(f, center); + BM_face_calc_center_median(f, center); copy_v3db_v3fl(plane_db, f->no); plane_db[3] = -dot_v3db_v3fl(plane_db, center); diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 6da32f5e874..a5a33c834a6 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -1588,7 +1588,7 @@ bool BM_mesh_intersect( BLI_assert(ELEM(side, 0, 1)); side = !side; - // BM_face_calc_center_mean(f, co); + // BM_face_calc_center_median(f, co); BM_face_calc_point_in_face(f, co); hits = isect_bvhtree_point_v3(tree_pair[side], looptri_coords, co); diff --git a/source/blender/bmesh/tools/bmesh_path.c b/source/blender/bmesh/tools/bmesh_path.c index cc5ac6dd8ce..ab1e0df6cb7 100644 --- a/source/blender/bmesh/tools/bmesh_path.c +++ b/source/blender/bmesh/tools/bmesh_path.c @@ -215,7 +215,7 @@ static float edgetag_cut_cost_face(BMEdge *e_a, BMEdge *e_b, BMFace *f) mid_v3_v3v3(e_a_cent, e_a->v1->co, e_a->v1->co); mid_v3_v3v3(e_b_cent, e_b->v1->co, e_b->v1->co); - BM_face_calc_center_mean_weighted(f, f_cent); + BM_face_calc_center_median_weighted(f, f_cent); return step_cost_3_v3(e_a_cent, e_b_cent, f_cent); } @@ -380,8 +380,8 @@ static float facetag_cut_cost_edge(BMFace *f_a, BMFace *f_b, BMEdge *e, const vo float f_b_cent[3]; float e_cent[3]; - BM_face_calc_center_mean_weighted(f_a, f_a_cent); - BM_face_calc_center_mean_weighted(f_b, f_b_cent); + BM_face_calc_center_median_weighted(f_a, f_a_cent); + BM_face_calc_center_median_weighted(f_b, f_b_cent); #if 0 mid_v3_v3v3(e_cent, e->v1->co, e->v2->co); #else @@ -412,8 +412,8 @@ static float facetag_cut_cost_vert(BMFace *f_a, BMFace *f_b, BMVert *v, const vo float f_a_cent[3]; float f_b_cent[3]; - BM_face_calc_center_mean_weighted(f_a, f_a_cent); - BM_face_calc_center_mean_weighted(f_b, f_b_cent); + BM_face_calc_center_median_weighted(f_a, f_a_cent); + BM_face_calc_center_median_weighted(f_b, f_b_cent); return step_cost_3_v3_ex( f_a_cent, v->co, f_b_cent, diff --git a/source/blender/bmesh/tools/bmesh_wireframe.c b/source/blender/bmesh/tools/bmesh_wireframe.c index 57e0e0b44ca..22ba5a742cb 100644 --- a/source/blender/bmesh/tools/bmesh_wireframe.c +++ b/source/blender/bmesh/tools/bmesh_wireframe.c @@ -269,7 +269,7 @@ void BM_mesh_wireframe( if (verts_relfac) { if (use_relative_offset) { - verts_relfac[i] = BM_vert_calc_mean_tagged_edge_length(v_src); + verts_relfac[i] = BM_vert_calc_median_tagged_edge_length(v_src); } else { verts_relfac[i] = 1.0f; @@ -315,7 +315,7 @@ void BM_mesh_wireframe( verts_pos[i] = NULL; } - /* conflicts with BM_vert_calc_mean_tagged_edge_length */ + /* conflicts with BM_vert_calc_median_tagged_edge_length */ if (use_relative_offset == false) { BM_elem_flag_disable(v_src, BM_ELEM_TAG); } |