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/makesrna/intern/rna_nla.c | |
| parent | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (diff) | |
| parent | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_nla.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 0e43f12b64b..a14508ecb18 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -470,7 +470,7 @@ static void rna_NlaTrack_solo_set(PointerRNA *ptr, int value) #else /* enum defines exported for rna_animation.c */ -EnumPropertyItem rna_enum_nla_mode_blend_items[] = { +const EnumPropertyItem rna_enum_nla_mode_blend_items[] = { {NLASTRIP_MODE_REPLACE, "REPLACE", 0, "Replace", "Result strip replaces the accumulated results by amount specified by influence"}, {NLASTRIP_MODE_ADD, "ADD", 0, "Add", "Weighted result of strip is added to the accumulated results"}, @@ -481,7 +481,7 @@ EnumPropertyItem rna_enum_nla_mode_blend_items[] = { {0, NULL, 0, NULL, NULL} }; -EnumPropertyItem rna_enum_nla_mode_extend_items[] = { +const EnumPropertyItem rna_enum_nla_mode_extend_items[] = { {NLASTRIP_EXTEND_NOTHING, "NOTHING", 0, "Nothing", "Strip has no influence past its extents"}, {NLASTRIP_EXTEND_HOLD, "HOLD", 0, "Hold", "Hold the first frame if no previous strips in track, and always hold last frame"}, @@ -520,7 +520,7 @@ static void rna_def_nlastrip(BlenderRNA *brna) PropertyRNA *prop; /* enum defs */ - static EnumPropertyItem prop_type_items[] = { + static const EnumPropertyItem prop_type_items[] = { {NLASTRIP_TYPE_CLIP, "CLIP", 0, "Action Clip", "NLA Strip references some Action"}, {NLASTRIP_TYPE_TRANSITION, "TRANSITION", 0, "Transition", "NLA Strip 'transitions' between adjacent strips"}, {NLASTRIP_TYPE_META, "META", 0, "Meta", "NLA Strip acts as a container for adjacent strips"}, |