diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 09:09:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 09:09:41 +0300 |
commit | ec2bbc90e7c6a7f21da253333a14d49ef1428319 (patch) | |
tree | 0ee36fb8e39593f29197d5fae17b885cc1a700e1 /source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c | |
parent | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (diff) | |
parent | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index 81b30f60cbf..1348847167c 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -145,7 +145,7 @@ static int weight_from_bones_exec(bContext *C, wmOperator *op) void PAINT_OT_weight_from_bones(wmOperatorType *ot) { - static EnumPropertyItem type_items[] = { + static const EnumPropertyItem type_items[] = { {ARM_GROUPS_AUTO, "AUTOMATIC", 0, "Automatic", "Automatic weights from bones"}, {ARM_GROUPS_ENVELOPE, "ENVELOPES", 0, "From Envelopes", "Weights from envelopes with user defined radius"}, {0, NULL, 0, NULL, NULL}}; @@ -288,7 +288,7 @@ static bool weight_paint_sample_enum_itemf__helper(const MDeformVert *dvert, con } return found; } -static EnumPropertyItem *weight_paint_sample_enum_itemf( +static const EnumPropertyItem *weight_paint_sample_enum_itemf( bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free) { if (C) { @@ -837,7 +837,7 @@ static int paint_weight_gradient_invoke(bContext *C, wmOperator *op, const wmEve void PAINT_OT_weight_gradient(wmOperatorType *ot) { /* defined in DNA_space_types.h */ - static EnumPropertyItem gradient_types[] = { + static const EnumPropertyItem gradient_types[] = { {WPAINT_GRADIENT_TYPE_LINEAR, "LINEAR", 0, "Linear", ""}, {WPAINT_GRADIENT_TYPE_RADIAL, "RADIAL", 0, "Radial", ""}, {0, NULL, 0, NULL, NULL} |