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_core.c | |
| parent | aca13040dac986e34468e7d533d0c3cc970fda90 (diff) | |
| parent | aa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_core.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 648e27adc87..1fe0dc15b0c 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1333,9 +1333,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); |