diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-18 18:17:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-18 18:19:44 +0300 |
commit | 4439e5d0ba3ffde3841ec44405a9bcaf800be279 (patch) | |
tree | d0955d8e18d854603da54bed39c46ef9627c4736 /source/blender/blenkernel/intern | |
parent | 098f75897e3ddf4bb93f64cecb322d7370127419 (diff) |
Cleanup: add trailing commas to avoid right shift
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/colortools.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_mesh.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/tracking_util.c | 12 |
5 files changed, 29 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 96c098b37e9..6d3aea91bc4 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -1456,8 +1456,7 @@ void scopes_update(Scopes *scopes, unsigned int nl, na, nr, ng, nb; double divl, diva, divr, divg, divb; const unsigned char *display_buffer = NULL; - unsigned int bin_lum[256] = {0}, bin_r[256] = {0}, bin_g[256] = {0}, bin_b[256] = {0}, - bin_a[256] = {0}; + uint bin_lum[256] = {0}, bin_r[256] = {0}, bin_g[256] = {0}, bin_b[256] = {0}, bin_a[256] = {0}; int ycc_mode = -1; void *cache_handle = NULL; struct ColormanageProcessor *cm_processor = NULL; diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 50c72f5a57f..acb0fd350d2 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1777,7 +1777,10 @@ static void emit_from_mesh_task_cb(void *__restrict userdata, const int index = smoke_get_index( x - data->min[0], data->res[0], y - data->min[1], data->res[1], z - data->min[2]); const float ray_start[3] = { - lx + 0.5f * data->hr, ly + 0.5f * data->hr, lz + 0.5f * data->hr}; + lx + 0.5f * data->hr, + ly + 0.5f * data->hr, + lz + 0.5f * data->hr, + }; sample_mesh(data->sfs, data->mvert, diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index d461394bc02..885898d9a57 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -267,8 +267,10 @@ static void vertex_interpolation_from_corner(const SubdivMeshContext *ctx, coarse_mloop[coarse_poly->loopstart + (first_loop_index - coarse_poly->loopstart + 1) % coarse_poly->totloop] .v}; - const int last_indices[2] = {coarse_mloop[first_loop_index].v, - coarse_mloop[last_loop_index].v}; + const int last_indices[2] = { + coarse_mloop[first_loop_index].v, + coarse_mloop[last_loop_index].v, + }; CustomData_interp(vertex_data, &vertex_interpolation->vertex_data_storage, first_indices, @@ -393,8 +395,10 @@ static void loop_interpolation_from_corner(const SubdivMeshContext *ctx, const int second_loop_index = base_loop_index + (first_loop_index - base_loop_index + 1) % coarse_poly->totloop; const int first_indices[2] = {first_loop_index, second_loop_index}; - const int last_indices[2] = {loops_of_ptex.last_loop - coarse_mloop, - loops_of_ptex.first_loop - coarse_mloop}; + const int last_indices[2] = { + loops_of_ptex.last_loop - coarse_mloop, + loops_of_ptex.first_loop - coarse_mloop, + }; CustomData_interp( loop_data, &loop_interpolation->loop_data_storage, first_indices, weights, NULL, 2, 1); CustomData_interp( diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index c478ce274b8..f176d7e0118 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1084,10 +1084,14 @@ float *BKE_tracking_track_get_mask(int frame_width, MovieTrackingMarker *marker) { /* Convert normalized space marker's search area to pixel-space region. */ - const float region_min[2] = {marker->search_min[0] * frame_width, - marker->search_min[1] * frame_height}; - const float region_max[2] = {marker->search_max[0] * frame_width, - marker->search_max[1] * frame_height}; + const float region_min[2] = { + marker->search_min[0] * frame_width, + marker->search_min[1] * frame_height, + }; + const float region_max[2] = { + marker->search_max[0] * frame_width, + marker->search_max[1] * frame_height, + }; return tracking_track_get_mask_for_region( frame_width, frame_height, region_min, region_max, track); } diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c index 4de10aca0ec..644e03af396 100644 --- a/source/blender/blenkernel/intern/tracking_util.c +++ b/source/blender/blenkernel/intern/tracking_util.c @@ -927,10 +927,14 @@ static libmv_CacheKey accessor_get_mask_for_track_callback(libmv_FrameAccessorUs BKE_movieclip_get_size(clip, &user, &frame_width, &frame_height); /* Actual mask sampling. */ MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, frame); - const float region_min[2] = {region->min[0] - marker->pos[0] * frame_width, - region->min[1] - marker->pos[1] * frame_height}; - const float region_max[2] = {region->max[0] - marker->pos[0] * frame_width, - region->max[1] - marker->pos[1] * frame_height}; + const float region_min[2] = { + region->min[0] - marker->pos[0] * frame_width, + region->min[1] - marker->pos[1] * frame_height, + }; + const float region_max[2] = { + region->max[0] - marker->pos[0] * frame_width, + region->max[1] - marker->pos[1] * frame_height, + }; *r_destination = tracking_track_get_mask_for_region( frame_width, frame_height, region_min, region_max, track); *r_width = region->max[0] - region->min[0]; |