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_mods.c | |
| parent | aca13040dac986e34468e7d533d0c3cc970fda90 (diff) | |
| parent | aa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mods.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 5e6c4cd2fee..4fa28e81359 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); |