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/transform | |
| parent | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (diff) | |
| parent | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_ops.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 4745631e85c..40309b701a4 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -808,7 +808,7 @@ enum { /* called in transform_ops.c, on each regeneration of keymaps */ wmKeyMap *transform_modal_keymap(wmKeyConfig *keyconf) { - static EnumPropertyItem modal_items[] = { + static const EnumPropertyItem modal_items[] = { {TFM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, {TFM_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, {TFM_MODAL_TRANSLATE, "TRANSLATE", 0, "Translate", ""}, diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index ec5342ff5b4..ad855427ff1 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -122,7 +122,7 @@ static TransformModeItem transform_modes[] = {NULL, 0} }; -EnumPropertyItem rna_enum_transform_mode_types[] = +const EnumPropertyItem rna_enum_transform_mode_types[] = { {TFM_INIT, "INIT", 0, "Init", ""}, {TFM_DUMMY, "DUMMY", 0, "Dummy", ""}, |