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_operators.h | |
parent | aca13040dac986e34468e7d533d0c3cc970fda90 (diff) | |
parent | aa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_operators.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h index 3e96d5ff44a..21b356155ed 100644 --- a/source/blender/bmesh/intern/bmesh_operators.h +++ b/source/blender/bmesh/intern/bmesh_operators.h @@ -104,8 +104,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 }; |