[Bf-blender-cvs] [6e2d9ef2db3] master: Cleanup: naming (mean -> median) see T47811
Campbell Barton
noreply at git.blender.org
Fri Dec 14 00:58:16 CET 2018
Commit: 6e2d9ef2db3776cf5f6f8a8f685da0aa668f9ae6
Author: Campbell Barton
Date: Fri Dec 14 10:54:11 2018 +1100
Branches: master
https://developer.blender.org/rB6e2d9ef2db3776cf5f6f8a8f685da0aa668f9ae6
Cleanup: naming (mean -> median) see T47811
===================================================================
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/intern/bmesh_polygon.h
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/intern/bmesh_query.h
M source/blender/bmesh/operators/bmo_normals.c
M source/blender/bmesh/operators/bmo_planar_faces.c
M source/blender/bmesh/operators/bmo_poke.c
M source/blender/bmesh/operators/bmo_similar.c
M source/blender/bmesh/tools/bmesh_decimate_collapse.c
M source/blender/bmesh/tools/bmesh_intersect.c
M source/blender/bmesh/tools/bmesh_path.c
M source/blender/bmesh/tools/bmesh_wireframe.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/transform/transform.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/python/bmesh/bmesh_py_types.c
===================================================================
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index c22ede5ebf1..b5ff812e790 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -154,12 +154,12 @@ static void emDM_ensurePolyCenters(EditDerivedBMesh *bmdm)
BM_mesh_elem_index_ensure(bm, BM_VERT);
BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) {
- BM_face_calc_center_mean_vcos(bm, efa, polyCos[i], vertexCos);
+ BM_face_calc_center_median_vcos(bm, efa, polyCos[i], vertexCos);
}
}
else {
BM_ITER_MESH_INDEX (efa, &fiter, bm, BM_FACES_OF_MESH, i) {
- BM_face_calc_center_mean(efa, polyCos[i]);
+ BM_face_calc_center_median(efa, polyCos[i]);
}
}
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index c384497e0d1..61cc3fbb683 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -1332,9 +1332,9 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del)
float f_center[3];
float (*faces_center)[3] = BLI_array_alloca(faces_center, totface);
- BM_face_calc_center_mean(f_new, f_center);
+ BM_face_calc_center_median(f_new, f_center);
for (i = 0; i < totface; i++) {
- BM_face_calc_center_mean(faces[i], faces_center[i]);
+ BM_face_calc_center_median(faces[i], faces_center[i]);
}
l_iter = l_first = BM_FACE_FIRST_LOOP(f_new);
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index e9c92e0d5e4..26c62d1086e 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -253,7 +253,7 @@ static int compute_mdisp_quad(
{
float cent[3];
/* computer center */
- BM_face_calc_center_mean(l->f, cent);
+ BM_face_calc_center_median(l->f, cent);
BLI_assert(equals_v3v3(cent, l_f_center));
}
#endif
@@ -527,8 +527,8 @@ void BM_loop_interp_multires(BMesh *bm, BMLoop *l_dst, const BMFace *f_src)
float f_dst_center[3];
float f_src_center[3];
- BM_face_calc_center_mean(l_dst->f, f_dst_center);
- BM_face_calc_center_mean(f_src, f_src_center);
+ BM_face_calc_center_median(l_dst->f, f_dst_center);
+ BM_face_calc_center_median(f_src, f_src_center);
BM_loop_interp_multires_ex(bm, l_dst, f_src, f_dst_center, f_src_center, cd_loop_mdisp_offset);
}
@@ -555,8 +555,8 @@ void BM_face_interp_multires(BMesh *bm, BMFace *f_dst, const BMFace *f_src)
float f_dst_center[3];
float f_src_center[3];
- BM_face_calc_center_mean(f_dst, f_dst_center);
- BM_face_calc_center_mean(f_src, f_src_center);
+ BM_face_calc_center_median(f_dst, f_dst_center);
+ BM_face_calc_center_median(f_src, f_src_center);
BM_face_interp_multires_ex(bm, f_dst, f_src, f_dst_center, f_src_center, cd_loop_mdisp_offset);
}
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 1e53180396e..3e30627af0d 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -828,7 +828,7 @@ void BM_editselection_center(BMEditSelection *ese, float r_center[3])
}
else if (ese->htype == BM_FACE) {
BMFace *efa = (BMFace *)ese->ele;
- BM_face_calc_center_mean(efa, r_center);
+ BM_face_calc_center_median(efa, r_center);
}
}
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index e95d5239caf..7ce908009cc 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -299,12 +299,12 @@ BMFace *BM_face_split(
float f_dst_center[3];
float f_src_center[3];
- BM_face_calc_center_mean(f_tmp, f_src_center);
+ BM_face_calc_center_median(f_tmp, f_src_center);
- BM_face_calc_center_mean(f, f_dst_center);
+ BM_face_calc_center_median(f, f_dst_center);
BM_face_interp_multires_ex(bm, f, f_tmp, f_dst_center, f_src_center, cd_loop_mdisp_offset);
- BM_face_calc_center_mean(f_new, f_dst_center);
+ BM_face_calc_center_median(f_new, f_dst_center);
BM_face_interp_multires_ex(bm, f_new, f_tmp, f_dst_center, f_src_center, cd_loop_mdisp_offset);
#if 0
@@ -642,7 +642,7 @@ BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float fac)
for (i = 0; i < BLI_array_len(oldfaces); i++) {
float f_center_old[3];
- BM_face_calc_center_mean(oldfaces[i], f_center_old);
+ BM_face_calc_center_median(oldfaces[i], f_center_old);
for (j = 0; j < 2; j++) {
BMEdge *e1 = j ? e_new : e;
@@ -660,7 +660,7 @@ BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float fac)
if (BM_ELEM_API_FLAG_TEST(l->f, _FLAG_OVERLAP)) {
float f_center[3];
- BM_face_calc_center_mean(l->f, f_center);
+ BM_face_calc_center_median(l->f, f_center);
BM_face_interp_multires_ex(
bm, l->f, oldfaces[i],
f_center, f_center_old, cd_loop_mdisp_offset);
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index 9751c2d8aef..1574a2a97c4 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -108,7 +108,7 @@ static float bm_face_calc_poly_normal_vertex_cos(
/**
* \brief COMPUTE POLY CENTER (BMFace)
*/
-static void bm_face_calc_poly_center_mean_vertex_cos(
+static void bm_face_calc_poly_center_median_vertex_cos(
const BMFace *f, float r_cent[3],
float const (*vertexCos)[3])
{
@@ -585,7 +585,7 @@ void BM_face_calc_center_bounds(const BMFace *f, float r_cent[3])
/**
* computes the center of a face, using the mean average
*/
-void BM_face_calc_center_mean(const BMFace *f, float r_cent[3])
+void BM_face_calc_center_median(const BMFace *f, float r_cent[3])
{
const BMLoop *l_iter, *l_first;
@@ -602,7 +602,7 @@ void BM_face_calc_center_mean(const BMFace *f, float r_cent[3])
* computes the center of a face, using the mean average
* weighted by edge length
*/
-void BM_face_calc_center_mean_weighted(const BMFace *f, float r_cent[3])
+void BM_face_calc_center_median_weighted(const BMFace *f, float r_cent[3])
{
const BMLoop *l_iter;
const BMLoop *l_first;
@@ -880,7 +880,7 @@ float BM_face_calc_normal_subset(const BMLoop *l_first, const BMLoop *l_last, fl
}
/* exact same as 'BM_face_calc_normal' but accepts vertex coords */
-void BM_face_calc_center_mean_vcos(
+void BM_face_calc_center_median_vcos(
const BMesh *bm, const BMFace *f, float r_cent[3],
float const (*vertexCos)[3])
{
@@ -888,7 +888,7 @@ void BM_face_calc_center_mean_vcos(
BLI_assert((bm->elem_index_dirty & BM_VERT) == 0);
(void)bm;
- bm_face_calc_poly_center_mean_vertex_cos(f, r_cent, vertexCos);
+ bm_face_calc_poly_center_median_vertex_cos(f, r_cent, vertexCos);
}
/**
@@ -1103,7 +1103,7 @@ void BM_face_triangulate(
}
if (cd_loop_mdisp_offset != -1) {
- BM_face_calc_center_mean(f, f_center);
+ BM_face_calc_center_median(f, f_center);
}
/* loop over calculated triangles and create new geometry */
@@ -1175,7 +1175,7 @@ void BM_face_triangulate(
if (cd_loop_mdisp_offset != -1) {
float f_new_center[3];
- BM_face_calc_center_mean(f_new, f_new_center);
+ BM_face_calc_center_median(f_new, f_new_center);
BM_face_interp_multires_ex(bm, f_new, f, f_new_center, f_center, cd_loop_mdisp_offset);
}
}
diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h
index 1d5fb2cc620..e8d7609fc20 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.h
+++ b/source/blender/bmesh/intern/bmesh_polygon.h
@@ -53,11 +53,11 @@ void BM_face_calc_tangent_edge_diagonal(const BMFace *f, float r_plane[3]) ATTR
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_center_mean(const BMFace *f, float center[3]) ATTR_NONNULL();
-void BM_face_calc_center_mean_vcos(
+void BM_face_calc_center_median(const BMFace *f, float center[3]) ATTR_NONNULL();
+void BM_face_calc_center_median_vcos(
const BMesh *bm, const BMFace *f, float r_cent[3],
float const (*vertexCos)[3]) ATTR_NONNULL();
-void BM_face_calc_center_mean_weighted(const BMFace *f, float center[3]) ATTR_NONNULL();
+void BM_face_calc_center_median_weighted(const BMFace *f, float center[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 78fb28bda2f..b34cfe4120c 100644
--- a/source/blender/bmesh/intern/bmesh_query.c
+++ b/source/blender/bmesh/intern/bmesh_query.c
@@ -1860,7 +1860,7 @@ float BM_vert_calc_shell_factor_ex(const BMVert *v, const float no[3], const cha
* \note quite an obscure function.
* used in bmesh operators that have a relative scale options,
*/
-float BM_vert_calc_mean_tagged_edge_length(const BMVert *v)
+float BM_vert_calc_median_tagged_edge_length(const BMVert *v)
{
BMIter iter;
BMEdge *e;
diff --git a/source/blender/bmesh/intern/bmesh_query.h b/source/blender/bmesh/intern/bmesh_query.h
index 17bf0f38d0c..0572a6c013a 100644
--- a/source/blender/bmesh/intern/bmesh_query.h
+++ b/source/blender/bmesh/intern/bmesh_query.h
@@ -132,7 +132,7 @@ float BM_vert_calc_edge_angle(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NO
float BM_vert_calc_edge_angle_ex(const BMVert *v, const float fallback) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
float BM_vert_calc_shell_factor(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
float BM_vert_calc_shell_factor_ex(const BMVert *v, const float no[3], const char hflag) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
-float BM_vert_calc_mean_tagged_edge_length(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+float BM_vert_calc_median_tagged_edge_length(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
BMLoop *BM_face_f
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list