diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 03:01:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 03:06:34 +0300 |
| commit | aa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (patch) | |
| tree | dde92dceaae332c38e92353c4758e0926be577d4 /source/blender/bmesh | |
| parent | 6e2d9ef2db3776cf5f6f8a8f685da0aa668f9ae6 (diff) | |
Missed last commit
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.h | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_poke.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h index b670f31ad9f..08eb2e59fb7 100644 --- a/source/blender/bmesh/intern/bmesh_operators.h +++ b/source/blender/bmesh/intern/bmesh_operators.h @@ -114,8 +114,8 @@ enum { /* Poke face center calculation */ enum { - BMOP_POKE_MEAN_WEIGHTED = 0, - BMOP_POKE_MEAN, + BMOP_POKE_MEDIAN_WEIGHTED = 0, + BMOP_POKE_MEDIAN, BMOP_POKE_BOUNDS }; diff --git a/source/blender/bmesh/operators/bmo_poke.c b/source/blender/bmesh/operators/bmo_poke.c index 3d9b2edd135..ea84a69855d 100644 --- a/source/blender/bmesh/operators/bmo_poke.c +++ b/source/blender/bmesh/operators/bmo_poke.c @@ -57,13 +57,13 @@ void bmo_poke_exec(BMesh *bm, BMOperator *op) void (*bm_face_calc_center_fn)(const BMFace *f, float r_cent[3]); switch (center_mode) { - case BMOP_POKE_MEAN_WEIGHTED: + case BMOP_POKE_MEDIAN_WEIGHTED: bm_face_calc_center_fn = BM_face_calc_center_median_weighted; break; case BMOP_POKE_BOUNDS: bm_face_calc_center_fn = BM_face_calc_center_bounds; break; - case BMOP_POKE_MEAN: + case BMOP_POKE_MEDIAN: bm_face_calc_center_fn = BM_face_calc_center_median; break; default: @@ -90,7 +90,7 @@ void bmo_poke_exec(BMesh *bm, BMOperator *op) BMO_vert_flag_enable(bm, v_center, ELE_NEW); if (cd_loop_mdisp_offset != -1) { - if (center_mode == BMOP_POKE_MEAN) { + if (center_mode == BMOP_POKE_MEDIAN) { copy_v3_v3(f_center_mean, f_center); } else { |