From b134434224254d4ac3fc73d023f2f6d914746690 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Aug 2020 22:36:11 +1000 Subject: Cleanup: declare arrays arrays where possible --- source/blender/editors/space_clip/clip_graph_ops.c | 6 +++--- source/blender/editors/space_clip/tracking_ops.c | 6 +++--- source/blender/editors/space_clip/tracking_select.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/editors/space_clip') diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 589831b1c45..63d9889e662 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -114,7 +114,7 @@ static void find_nearest_tracking_segment_cb(void *userdata, float val) { MouseSelectUserData *data = userdata; - float co[2] = {scene_framenr, val}; + const float co[2] = {scene_framenr, val}; if (!clip_graph_value_visible(data->sc, value_source)) { return; @@ -151,7 +151,7 @@ static void find_nearest_tracking_knot_cb(void *userdata, float val) { MouseSelectUserData *data = userdata; - float mdiff[2] = {scene_framenr - data->mouse_co[0], val - data->mouse_co[1]}; + const float mdiff[2] = {scene_framenr - data->mouse_co[0], val - data->mouse_co[1]}; float dist_sq = len_squared_v2(mdiff); if (!clip_graph_value_visible(data->sc, value_source)) { @@ -159,7 +159,7 @@ static void find_nearest_tracking_knot_cb(void *userdata, } if (data->marker == NULL || dist_sq < data->min_dist_sq) { - float co[2] = {scene_framenr, val}; + const float co[2] = {scene_framenr, val}; data->track = track; data->marker = marker; diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 739701b5595..177a0bc2bcf 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -513,7 +513,7 @@ static bool slide_check_corners(float (*corners)[2]) { int i, next, prev; float cross = 0.0f; - float p[2] = {0.0f, 0.0f}; + const float p[2] = {0.0f, 0.0f}; if (!isect_point_quad_v2(p, corners[0], corners[1], corners[2], corners[3])) { return false; @@ -861,7 +861,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event) BKE_tracking_marker_clamp(data->marker, CLAMP_PAT_DIM); } else if (data->action == SLIDE_ACTION_OFFSET) { - float d[2] = {dx, dy}; + const float d[2] = {dx, dy}; for (int a = 0; a < data->track->markersnr; a++) { add_v2_v2v2(data->track->markers[a].pos, data->old_markers[a], d); } @@ -940,7 +940,7 @@ static int slide_marker_modal(bContext *C, wmOperator *op, const wmEvent *event) BKE_tracking_marker_clamp(data->marker, CLAMP_SEARCH_DIM); } else if (data->area == TRACK_AREA_SEARCH) { - float d[2] = {dx, dy}; + const float d[2] = {dx, dy}; add_v2_v2v2(data->min, data->old_search_min, d); add_v2_v2v2(data->max, data->old_search_max, d); } diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index b6f9ca9589f..615d09a04b2 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -153,9 +153,9 @@ static float dist_to_rect(const float co[2], const float max[2]) { float d1, d2, d3, d4; - float p[2] = {co[0] - pos[0], co[1] - pos[1]}; - float v1[2] = {min[0], min[1]}, v2[2] = {max[0], min[1]}; - float v3[2] = {max[0], max[1]}, v4[2] = {min[0], max[1]}; + const float p[2] = {co[0] - pos[0], co[1] - pos[1]}; + const float v1[2] = {min[0], min[1]}, v2[2] = {max[0], min[1]}; + const float v3[2] = {max[0], max[1]}, v4[2] = {min[0], max[1]}; d1 = dist_squared_to_line_segment_v2(p, v1, v2); d2 = dist_squared_to_line_segment_v2(p, v2, v3); @@ -169,7 +169,7 @@ static float dist_to_rect(const float co[2], static float dist_to_crns(const float co[2], const float pos[2], const float crns[4][2]) { float d1, d2, d3, d4; - float p[2] = {co[0] - pos[0], co[1] - pos[1]}; + const float p[2] = {co[0] - pos[0], co[1] - pos[1]}; const float *v1 = crns[0], *v2 = crns[1]; const float *v3 = crns[2], *v4 = crns[3]; -- cgit v1.2.3