diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 03:09:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 03:09:42 +0300 |
commit | dd4c87cd0451376bce96c459d90c2b95409f0d11 (patch) | |
tree | 576ee74ff71032c2b6eec94e549a1dba90edec96 /source/blender/bmesh/intern/bmesh_polygon.c | |
parent | aca13040dac986e34468e7d533d0c3cc970fda90 (diff) | |
parent | aa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_polygon.c')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 7c315ba27fc..87903b3fd58 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); } } |