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/screen | |
| parent | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (diff) | |
| parent | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index ac0c411aafc..aeafa806689 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1786,7 +1786,7 @@ static int area_split_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_RUNNING_MODAL; } -static EnumPropertyItem prop_direction_items[] = { +static const EnumPropertyItem prop_direction_items[] = { {'h', "HORIZONTAL", 0, "Horizontal", ""}, {'v', "VERTICAL", 0, "Vertical", ""}, {0, NULL, 0, NULL, NULL} @@ -4081,7 +4081,7 @@ enum { SPACE_CONTEXT_CYCLE_NEXT, }; -static EnumPropertyItem space_context_cycle_direction[] = { +static const EnumPropertyItem space_context_cycle_direction[] = { {SPACE_CONTEXT_CYCLE_PREV, "PREV", 0, "Previous", ""}, {SPACE_CONTEXT_CYCLE_NEXT, "NEXT", 0, "Next", ""}, {0, NULL, 0, NULL, NULL} @@ -4220,7 +4220,7 @@ void ED_operatortypes_screen(void) static void keymap_modal_set(wmKeyConfig *keyconf) { - static EnumPropertyItem modal_items[] = { + static const EnumPropertyItem modal_items[] = { {KM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, {KM_MODAL_APPLY, "APPLY", 0, "Apply", ""}, {KM_MODAL_STEP10, "STEP10", 0, "Steps on", ""}, |