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/animation/anim_channels_edit.c | |
parent | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (diff) | |
parent | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/animation/anim_channels_edit.c')
-rw-r--r-- | source/blender/editors/animation/anim_channels_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 051d9377207..26ba61f0f20 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -682,7 +682,7 @@ typedef enum eRearrangeAnimChan_Mode { } eRearrangeAnimChan_Mode; /* defines for rearranging channels */ -static EnumPropertyItem prop_animchannel_rearrange_types[] = { +static const EnumPropertyItem prop_animchannel_rearrange_types[] = { {REARRANGE_ANIMCHAN_TOP, "TOP", 0, "To Top", ""}, {REARRANGE_ANIMCHAN_UP, "UP", 0, "Up", ""}, {REARRANGE_ANIMCHAN_DOWN, "DOWN", 0, "Down", ""}, @@ -1745,7 +1745,7 @@ static void ANIM_OT_channels_delete(wmOperatorType *ot) /* ********************** Set Flags Operator *********************** */ /* defines for setting animation-channel flags */ -static EnumPropertyItem prop_animchannel_setflag_types[] = { +static const EnumPropertyItem prop_animchannel_setflag_types[] = { {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, "Toggle", ""}, {ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, "Disable", ""}, {ACHANNEL_SETFLAG_ADD, "ENABLE", 0, "Enable", ""}, @@ -1755,7 +1755,7 @@ static EnumPropertyItem prop_animchannel_setflag_types[] = { /* defines for set animation-channel settings */ // TODO: could add some more types, but those are really quite dependent on the mode... -static EnumPropertyItem prop_animchannel_settings_types[] = { +static const EnumPropertyItem prop_animchannel_settings_types[] = { {ACHANNEL_SETTING_PROTECT, "PROTECT", 0, "Protect", ""}, {ACHANNEL_SETTING_MUTE, "MUTE", 0, "Mute", ""}, {0, NULL, 0, NULL, NULL} |