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/physics/particle_edit.c | |
parent | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (diff) | |
parent | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics/particle_edit.c')
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 17efc31b2e8..67ba1a1312a 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1630,7 +1630,7 @@ void PARTICLE_OT_select_tips(wmOperatorType *ot) enum { RAN_HAIR, RAN_POINTS }; -static EnumPropertyItem select_random_type_items[] = { +static const EnumPropertyItem select_random_type_items[] = { {RAN_HAIR, "HAIR", 0, "Hair", ""}, {RAN_POINTS, "POINTS", 0, "Points", ""}, {0, NULL, 0, NULL, NULL} @@ -2771,7 +2771,7 @@ static void toggle_particle_cursor(bContext *C, int enable) enum { DEL_PARTICLE, DEL_KEY }; -static EnumPropertyItem delete_type_items[] = { +static const EnumPropertyItem delete_type_items[] = { {DEL_PARTICLE, "PARTICLE", 0, "Particle", ""}, {DEL_KEY, "KEY", 0, "Key", ""}, {0, NULL, 0, NULL, NULL}}; |