Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-14 03:09:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-14 03:09:42 +0300
commitdd4c87cd0451376bce96c459d90c2b95409f0d11 (patch)
tree576ee74ff71032c2b6eec94e549a1dba90edec96 /source/blender/bmesh/intern/bmesh_opdefines.c
parentaca13040dac986e34468e7d533d0c3cc970fda90 (diff)
parentaa3c4b4cb64f5b14e5167237b1c807b5ecf658bb (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_opdefines.c')
-rw-r--r--source/blender/bmesh/intern/bmesh_opdefines.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index b7df6d8f90b..519ffa5ed59 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -1963,8 +1963,8 @@ static BMOpDefine bmo_wireframe_def = {
};
static BMO_FlagSet bmo_enum_poke_center_mode[] = {
- {BMOP_POKE_MEAN_WEIGHTED, "MEAN_WEIGHTED"},
- {BMOP_POKE_MEAN, "MEAN"},
+ {BMOP_POKE_MEDIAN_WEIGHTED, "MEAN_WEIGHTED"},
+ {BMOP_POKE_MEDIAN, "MEAN"},
{BMOP_POKE_BOUNDS, "BOUNDS"},
{0, NULL},
};