Merge branch 'master' into blender2.8

5 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c
index e42b8ab560d..e5a3cb6b57b 100644
--- a/source/blender/editors/space_clip/clip_graph_ops.c
+++ b/source/blender/editors/space_clip/clip_graph_ops.c
@@ -701,7 +701,7 @@ static int graph_disable_markers_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_graph_disable_markers(wmOperatorType *ot)
 {
-	static EnumPropertyItem actions_items[] = {
+	static const EnumPropertyItem actions_items[] = {
 		{0, "DISABLE", 0, "Disable", "Disable selected markers"},
 		{1, "ENABLE", 0, "Enable", "Enable selected markers"},
 		{2, "TOGGLE", 0, "Toggle", "Toggle disabled flag for selected markers"},
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index ea7ede46887..2439ac06d9c 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1138,7 +1138,7 @@ static int clear_track_path_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_clear_track_path(wmOperatorType *ot)
 {
-	static EnumPropertyItem clear_path_actions[] = {
+	static const EnumPropertyItem clear_path_actions[] = {
 		{TRACK_CLEAR_UPTO, "UPTO", 0, "Clear up-to", "Clear path up to current frame"},
 		{TRACK_CLEAR_REMAINED, "REMAINED", 0, "Clear remained", "Clear path at remaining frames (after current)"},
 		{TRACK_CLEAR_ALL, "ALL", 0, "Clear all", "Clear the whole path"},
@@ -1210,7 +1210,7 @@ static int disable_markers_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_disable_markers(wmOperatorType *ot)
 {
-	static EnumPropertyItem actions_items[] = {
+	static const EnumPropertyItem actions_items[] = {
 		{MARKER_OP_DISABLE, "DISABLE", 0, "Disable",
 		 "Disable selected markers"},
 		{MARKER_OP_ENABLE,  "ENABLE", 0, "Enable",
@@ -1477,7 +1477,7 @@ static int frame_jump_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_frame_jump(wmOperatorType *ot)
 {
-	static EnumPropertyItem position_items[] = {
+	static const EnumPropertyItem position_items[] = {
 		{0, "PATHSTART",  0, "Path Start",      "Jump to start of current path"},
 		{1, "PATHEND",    0, "Path End",        "Jump to end of current path"},
 		{2, "FAILEDPREV", 0, "Previous Failed", "Jump to previous failed frame"},
@@ -1645,7 +1645,7 @@ static int lock_tracks_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_lock_tracks(wmOperatorType *ot)
 {
-	static EnumPropertyItem actions_items[] = {
+	static const EnumPropertyItem actions_items[] = {
 		{TRACK_ACTION_LOCK, "LOCK", 0, "Lock", "Lock selected tracks"},
 		{TRACK_ACTION_UNLOCK, "UNLOCK", 0, "Unlock", "Unlock selected tracks"},
 		{TRACK_ACTION_TOGGLE, "TOGGLE", 0, "Toggle",
@@ -1701,7 +1701,7 @@ static int set_solver_keyframe_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_set_solver_keyframe(wmOperatorType *ot)
 {
-	static EnumPropertyItem keyframe_items[] = {
+	static const EnumPropertyItem keyframe_items[] = {
 		{SOLVER_KEYFRAME_A, "KEYFRAME_A", 0, "Keyframe A", ""},
 		{SOLVER_KEYFRAME_B, "KEYFRAME_B", 0, "Keyframe B", ""},
 		{0, NULL, 0, NULL, NULL}
@@ -1972,7 +1972,7 @@ static int clean_tracks_invoke(bContext *C,
 
 void CLIP_OT_clean_tracks(wmOperatorType *ot)
 {
-	static EnumPropertyItem actions_items[] = {
+	static const EnumPropertyItem actions_items[] = {
 		{TRACKING_CLEAN_SELECT, "SELECT", 0, "Select",
 		 "Select unclean tracks"},
 		{TRACKING_CLEAN_DELETE_TRACK, "DELETE_TRACK", 0, "Delete Track",
diff --git a/source/blender/editors/space_clip/tracking_ops_detect.c b/source/blender/editors/space_clip/tracking_ops_detect.c
index 992c347a630..0ee06b305da 100644
--- a/source/blender/editors/space_clip/tracking_ops_detect.c
+++ b/source/blender/editors/space_clip/tracking_ops_detect.c
@@ -128,7 +128,7 @@ static int detect_features_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_detect_features(wmOperatorType *ot)
 {
-	static EnumPropertyItem placement_items[] = {
+	static const EnumPropertyItem placement_items[] = {
 		{0, "FRAME",            0, "Whole Frame",
 		 "Place markers across the whole frame"},
 		{1, "INSIDE_GPENCIL",   0, "Inside grease pencil",
diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c
index c411f64a88b..1abfa0ae2a4 100644
--- a/source/blender/editors/space_clip/tracking_ops_orient.c
+++ b/source/blender/editors/space_clip/tracking_ops_orient.c
@@ -509,7 +509,7 @@ static int set_plane_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_set_plane(wmOperatorType *ot)
 {
-	static EnumPropertyItem plane_items[] = {
+	static const EnumPropertyItem plane_items[] = {
 		{0, "FLOOR", 0, "Floor", "Set floor plane"},
 		{1, "WALL", 0, "Wall", "Set wall plane"},
 		{0, NULL, 0, NULL, NULL}
@@ -583,7 +583,7 @@ static int set_axis_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_set_axis(wmOperatorType *ot)
 {
-	static EnumPropertyItem axis_actions[] = {
+	static const EnumPropertyItem axis_actions[] = {
 		{0, "X", 0, "X", "Align bundle align X axis"},
 		{1, "Y", 0, "Y", "Align bundle align Y axis"},
 		{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c
index 028b9c8a820..eddd65475a2 100644
--- a/source/blender/editors/space_clip/tracking_select.c
+++ b/source/blender/editors/space_clip/tracking_select.c
@@ -972,7 +972,7 @@ static int select_groped_exec(bContext *C, wmOperator *op)
 
 void CLIP_OT_select_grouped(wmOperatorType *ot)
 {
-	static EnumPropertyItem select_group_items[] = {
+	static const EnumPropertyItem select_group_items[] = {
 		{0, "KEYFRAMED", 0, "Keyframed tracks", "Select all keyframed tracks"},
 		{1, "ESTIMATED", 0, "Estimated tracks", "Select all estimated tracks"},
 		{2, "TRACKED", 0, "Tracked tracks", "Select all tracked tracks"},