2.5 merged 20773:21020

2 files changed, 27 insertions, 27 deletions

diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index af074ca348d..a0f1adbd97e 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -369,10 +369,10 @@ void ACT_OT_keyframes_paste (wmOperatorType *ot)
 
 /* defines for insert keyframes tool */
 EnumPropertyItem prop_actkeys_insertkey_types[] = {
-	{1, "ALL", "All Channels", ""},
-	{2, "SEL", "Only Selected Channels", ""},
-	{3, "GROUP", "In Active Group", ""}, // xxx not in all cases
-	{0, NULL, NULL, NULL}
+	{1, "ALL", 0, "All Channels", ""},
+	{2, "SEL", 0, "Only Selected Channels", ""},
+	{3, "GROUP", 0, "In Active Group", ""}, // xxx not in all cases
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* this function is responsible for snapping keyframes to frame-times */
@@ -799,9 +799,9 @@ void ACT_OT_keyframes_sample (wmOperatorType *ot)
 
 /* defines for set extrapolation-type for selected keyframes tool */
 EnumPropertyItem prop_actkeys_expo_types[] = {
-	{FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", "Constant Extrapolation", ""},
-	{FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", "Linear Extrapolation", ""},
-	{0, NULL, NULL, NULL}
+	{FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, "Constant Extrapolation", ""},
+	{FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, "Linear Extrapolation", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* this function is responsible for setting extrapolation mode for keyframes */
@@ -1089,11 +1089,11 @@ void ACT_OT_keyframes_cfrasnap (wmOperatorType *ot)
 
 /* defines for snap keyframes tool */
 EnumPropertyItem prop_actkeys_snap_types[] = {
-	{ACTKEYS_SNAP_CFRA, "CFRA", "Current frame", ""},
-	{ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", "Nearest Frame", ""}, // XXX as single entry?
-	{ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", "Nearest Second", ""}, // XXX as single entry?
-	{ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", "Nearest Marker", ""},
-	{0, NULL, NULL, NULL}
+	{ACTKEYS_SNAP_CFRA, "CFRA", 0, "Current frame", ""},
+	{ACTKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry?
+	{ACTKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry?
+	{ACTKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* this function is responsible for snapping keyframes to frame-times */
@@ -1188,11 +1188,11 @@ void ACT_OT_keyframes_snap (wmOperatorType *ot)
 
 /* defines for mirror keyframes tool */
 EnumPropertyItem prop_actkeys_mirror_types[] = {
-	{ACTKEYS_MIRROR_CFRA, "CFRA", "Current frame", ""},
-	{ACTKEYS_MIRROR_YAXIS, "YAXIS", "Vertical Axis", ""},
-	{ACTKEYS_MIRROR_XAXIS, "XAXIS", "Horizontal Axis", ""},
-	{ACTKEYS_MIRROR_MARKER, "MARKER", "First Selected Marker", ""},
-	{0, NULL, NULL, NULL}
+	{ACTKEYS_MIRROR_CFRA, "CFRA", 0, "Current frame", ""},
+	{ACTKEYS_MIRROR_YAXIS, "YAXIS", 0, "Vertical Axis", ""},
+	{ACTKEYS_MIRROR_XAXIS, "XAXIS", 0, "Horizontal Axis", ""},
+	{ACTKEYS_MIRROR_MARKER, "MARKER", 0, "First Selected Marker", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* this function is responsible for mirroring keyframes */
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index 826728e83f9..6bfdf77e2e7 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -374,11 +374,11 @@ void ACT_OT_keyframes_select_border(wmOperatorType *ot)
 
 /* defines for column-select mode */
 static EnumPropertyItem prop_column_select_types[] = {
-	{ACTKEYS_COLUMNSEL_KEYS, "KEYS", "On Selected Keyframes", ""},
-	{ACTKEYS_COLUMNSEL_CFRA, "CFRA", "On Current Frame", ""},
-	{ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", "On Selected Markers", ""},
-	{ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", "Between Min/Max Selected Markers", ""},
-	{0, NULL, NULL, NULL}
+	{ACTKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""},
+	{ACTKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""},
+	{ACTKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""},
+	{ACTKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* ------------------- */ 
@@ -584,11 +584,11 @@ void ACT_OT_keyframes_select_column (wmOperatorType *ot)
 
 /* defines for left-right select tool */
 static EnumPropertyItem prop_actkeys_leftright_select_types[] = {
-	{ACTKEYS_LRSEL_TEST, "CHECK", "Check if Select Left or Right", ""},
-	{ACTKEYS_LRSEL_NONE, "OFF", "Don't select", ""},
-	{ACTKEYS_LRSEL_LEFT, "LEFT", "Before current frame", ""},
-	{ACTKEYS_LRSEL_RIGHT, "RIGHT", "After current frame", ""},
-	{0, NULL, NULL, NULL}
+	{ACTKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""},
+	{ACTKEYS_LRSEL_NONE, "OFF", 0, "Don't select", ""},
+	{ACTKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""},
+	{ACTKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* sensitivity factor for frame-selections */