diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:01:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-03 06:59:11 +0300 |
commit | 744f6339865fa8ed00b2e98aa5812b94d67a8604 (patch) | |
tree | ac31a849b46a8214baf16b87e104841a5fa85b11 /source/blender/draw | |
parent | 141c6073ca39f0d59c67ebef89b094395b903a4a (diff) |
Cleanup: trailing commas
Needed for clan-format not to wrap onto one line.
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_lightcache.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_lights.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_private.h | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_render.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_data.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_studiolight.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache.c | 26 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_curve.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 46 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_view.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 2 |
12 files changed, 46 insertions, 46 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index 68456c2b4a3..5ce91fd0e8c 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -686,7 +686,7 @@ static void eevee_lightbake_cache_create(EEVEE_Data *vedata, EEVEE_LightBake *lb txl->color = lbake->rt_color; int viewport_size[2] = { GPU_texture_width(txl->color), - GPU_texture_height(txl->color) + GPU_texture_height(txl->color), }; DRW_render_viewport_size_set(viewport_size); diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 2e9c2286674..703c0fc781f 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -1052,7 +1052,7 @@ static void eevee_shadow_cascade_setup( { 1.0f, -1.0f, splits_end_ndc[c]}, {-1.0f, -1.0f, splits_end_ndc[c]}, {-1.0f, 1.0f, splits_end_ndc[c]}, - { 1.0f, 1.0f, splits_end_ndc[c]} + { 1.0f, 1.0f, splits_end_ndc[c]}, }; /* Transform them into world space */ diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 61676c05a0e..3711114832e 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -507,7 +507,7 @@ static void EEVEE_update_viewvecs(float invproj[4][4], float winmat[4][4], float {-1.0f, -1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, -1.0f, 1.0f}, - {-1.0f, -1.0f, 1.0f, 1.0f} + {-1.0f, -1.0f, 1.0f, 1.0f}, }; /* convert the view vectors to view space */ diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index d2e38f4a3ce..e04a0c75723 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -1012,7 +1012,7 @@ static const float texcomat[4][4] = { /* From NDC to TexCo */ {0.5f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.5f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.5f, 0.0f}, - {0.5f, 0.5f, 0.5f, 1.0f} + {0.5f, 0.5f, 0.5f, 1.0f}, }; /* Cubemap Matrices */ diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c index dd3989af50f..70e6b37bcd4 100644 --- a/source/blender/draw/engines/gpencil/gpencil_render.c +++ b/source/blender/draw/engines/gpencil/gpencil_render.c @@ -142,7 +142,7 @@ static void GPENCIL_render_update_viewvecs(float invproj[4][4], float winmat[4][ {-1.0f, -1.0f, -1.0f, 1.0f}, {1.0f, -1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, -1.0f, 1.0f}, - {-1.0f, -1.0f, 1.0f, 1.0f} + {-1.0f, -1.0f, 1.0f, 1.0f}, }; /* convert the view vectors to view space */ diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index 998b70831ea..74530e81eba 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -142,7 +142,7 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) float viewvecs[3][4] = { {-1.0f, -1.0f, -1.0f, 1.0f}, {1.0f, -1.0f, -1.0f, 1.0f}, - {-1.0f, 1.0f, -1.0f, 1.0f} + {-1.0f, 1.0f, -1.0f, 1.0f}, }; int i; const float *size = DRW_viewport_size_get(); diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c b/source/blender/draw/engines/workbench/workbench_studiolight.c index 835c9072ba2..12c0d73e7dc 100644 --- a/source/blender/draw/engines/workbench/workbench_studiolight.c +++ b/source/blender/draw/engines/workbench/workbench_studiolight.c @@ -268,7 +268,7 @@ bool studiolight_camera_in_object_shadow(WORKBENCH_PrivateData *wpd, Object *ob, {oed->shadow_min[0], oed->shadow_min[1]}, {oed->shadow_min[0], oed->shadow_max[1]}, {oed->shadow_max[0], oed->shadow_min[1]}, - {oed->shadow_max[0], oed->shadow_max[1]} + {oed->shadow_max[0], oed->shadow_max[1]}, }; for (int i = 0; i < 2; ++i) { diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index ba99de3e9fa..74a1f5ce49d 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -392,7 +392,7 @@ GPUBatch *DRW_cache_cube_get(void) { 1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, - { 1.0f, 1.0f, 1.0f} + { 1.0f, 1.0f, 1.0f}, }; const uint indices[36] = { @@ -440,7 +440,7 @@ GPUBatch *DRW_cache_empty_cube_get(void) { 1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, - { 1.0f, 1.0f, 1.0f} + { 1.0f, 1.0f, 1.0f}, }; const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6}; @@ -969,7 +969,7 @@ GPUBatch *DRW_cache_empty_capsule_body_get(void) {-1.0f, 0.0f, 1.0f}, {-1.0f, 0.0f, 0.0f}, { 0.0f, -1.0f, 1.0f}, - { 0.0f, -1.0f, 0.0f} + { 0.0f, -1.0f, 0.0f}, }; /* Position Only 3D format */ @@ -1924,7 +1924,7 @@ static const float bone_octahedral_verts[6][3] = { { 0.1f, 0.1f, -0.1f}, {-0.1f, 0.1f, -0.1f}, {-0.1f, 0.1f, 0.1f}, - { 0.0f, 1.0f, 0.0f} + { 0.0f, 1.0f, 0.0f}, }; static const float bone_octahedral_smooth_normals[6][3] = { @@ -1940,7 +1940,7 @@ static const float bone_octahedral_smooth_normals[6][3] = { {-M_SQRT1_2, 0.0f, -M_SQRT1_2}, {-M_SQRT1_2, 0.0f, M_SQRT1_2}, #endif - { 0.0f, 1.0f, 0.0f} + { 0.0f, 1.0f, 0.0f}, }; #if 0 /* UNUSED */ @@ -1969,7 +1969,7 @@ static const uint bone_octahedral_solid_tris[8][3] = { {5, 1, 2}, /* top */ {5, 2, 3}, {5, 3, 4}, - {5, 4, 1} + {5, 4, 1}, }; /** @@ -2012,7 +2012,7 @@ static const float bone_octahedral_solid_normals[8][3] = { { 0.99388373f, 0.11043154f, -0.00000000f}, { 0.00000000f, 0.11043154f, -0.99388373f}, {-0.99388373f, 0.11043154f, 0.00000000f}, - { 0.00000000f, 0.11043154f, 0.99388373f} + { 0.00000000f, 0.11043154f, 0.99388373f}, }; GPUBatch *DRW_cache_bone_octahedral_get(void) @@ -2081,7 +2081,7 @@ static const float bone_box_verts[8][3] = { { 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, - {-1.0f, 1.0f, 1.0f} + {-1.0f, 1.0f, 1.0f}, }; static const float bone_box_smooth_normals[8][3] = { @@ -2561,7 +2561,7 @@ static void set_bone_axis_vert( #define S_Y 0.025f static float x_axis_name[4][2] = { { 0.9f * S_X, 1.0f * S_Y}, {-1.0f * S_X, -1.0f * S_Y}, - {-0.9f * S_X, 1.0f * S_Y}, { 1.0f * S_X, -1.0f * S_Y} + {-0.9f * S_X, 1.0f * S_Y}, { 1.0f * S_X, -1.0f * S_Y}, }; #define X_LEN (sizeof(x_axis_name) / (sizeof(float) * 2)) #undef S_X @@ -2572,7 +2572,7 @@ static float x_axis_name[4][2] = { static float y_axis_name[6][2] = { {-1.0f * S_X, 1.0f * S_Y}, { 0.0f * S_X, -0.1f * S_Y}, { 1.0f * S_X, 1.0f * S_Y}, { 0.0f * S_X, -0.1f * S_Y}, - { 0.0f * S_X, -0.1f * S_Y}, { 0.0f * S_X, -1.0f * S_Y} + { 0.0f * S_X, -0.1f * S_Y}, { 0.0f * S_X, -1.0f * S_Y}, }; #define Y_LEN (sizeof(y_axis_name) / (sizeof(float) * 2)) #undef S_X @@ -2585,7 +2585,7 @@ static float z_axis_name[10][2] = { { 0.95f * S_X, 1.00f * S_Y}, { 0.95f * S_X, 0.90f * S_Y}, { 0.95f * S_X, 0.90f * S_Y}, {-1.00f * S_X, -0.90f * S_Y}, {-1.00f * S_X, -0.90f * S_Y}, {-1.00f * S_X, -1.00f * S_Y}, - {-1.00f * S_X, -1.00f * S_Y}, { 1.00f * S_X, -1.00f * S_Y} + {-1.00f * S_X, -1.00f * S_Y}, { 1.00f * S_X, -1.00f * S_Y}, }; #define Z_LEN (sizeof(z_axis_name) / (sizeof(float) * 2)) #undef S_X @@ -2619,7 +2619,7 @@ static float axis_name_shadow[8][2] = { {-S_X + O_X, S_Y + O_Y}, { S_X + O_X, S_Y + O_Y}, { S_X + O_X, S_Y + O_Y}, { S_X + O_X, -S_Y + O_Y}, { S_X + O_X, -S_Y + O_Y}, {-S_X + O_X, -S_Y + O_Y}, - {-S_X + O_X, -S_Y + O_Y}, {-S_X + O_X, S_Y + O_Y} + {-S_X + O_X, -S_Y + O_Y}, {-S_X + O_X, S_Y + O_Y}, }; // #define SHADOW_RES (sizeof(axis_name_shadow) / (sizeof(float) * 2)) #define SHADOW_RES 0 @@ -2715,7 +2715,7 @@ static const float staticSine[16] = { 0.406736643076f, 0.5f, 0.587785252292f, 0.669130606359f, 0.743144825477f, 0.809016994375f, 0.866025403784f, 0.913545457643f, 0.951056516295f, 0.978147600734f, - 0.994521895368f, 1.0f + 0.994521895368f, 1.0f, }; #define set_vert(a, b, quarter) \ diff --git a/source/blender/draw/intern/draw_cache_impl_curve.c b/source/blender/draw/intern/draw_cache_impl_curve.c index 1c0d228fad7..510cc790be2 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.c +++ b/source/blender/draw/intern/draw_cache_impl_curve.c @@ -752,7 +752,7 @@ static void curve_create_edit_data_and_handles( char vflag[3] = { beztriple_vflag_get(rdata, bezt->f1, bezt->h1, v_idx, nu_id), beztriple_vflag_get(rdata, bezt->f2, bezt->h1, v_idx, nu_id), - beztriple_vflag_get(rdata, bezt->f3, bezt->h2, v_idx, nu_id) + beztriple_vflag_get(rdata, bezt->f3, bezt->h2, v_idx, nu_id), }; for (int j = 0; j < 3; j++) { GPU_vertbuf_attr_set(vbo_data, attr_id.data, vbo_len_used + j, &vflag[j]); diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 73d5b3cf37b..f43efa14451 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -313,7 +313,7 @@ DRWShadingGroup *shgroup_dynlines_flat_color(DRWPass *pass) DRW_shgroup_instance_format(g_formats.dynlines_color, { {"pos", DRW_ATTR_FLOAT, 3}, - {"color", DRW_ATTR_FLOAT, 4} + {"color", DRW_ATTR_FLOAT, 4}, }); DRWShadingGroup *grp = DRW_shgroup_line_batch_create_with_format(sh, pass, g_formats.dynlines_color); @@ -384,7 +384,7 @@ DRWShadingGroup *shgroup_instance_screenspace( DRW_shgroup_instance_format(g_formats.instance_screenspace, { {"world_pos", DRW_ATTR_FLOAT, 3}, - {"color", DRW_ATTR_FLOAT, 3} + {"color", DRW_ATTR_FLOAT, 3}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_screenspace); @@ -404,7 +404,7 @@ DRWShadingGroup *shgroup_instance_solid(DRWPass *pass, struct GPUBatch *geom) DRW_shgroup_instance_format(g_formats.instance_color, { {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, - {"color", DRW_ATTR_FLOAT, 4} + {"color", DRW_ATTR_FLOAT, 4}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_color); @@ -419,7 +419,7 @@ DRWShadingGroup *shgroup_instance_wire(DRWPass *pass, struct GPUBatch *geom) DRW_shgroup_instance_format(g_formats.instance_color, { {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, - {"color", DRW_ATTR_FLOAT, 4} + {"color", DRW_ATTR_FLOAT, 4}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_color); @@ -435,7 +435,7 @@ DRWShadingGroup *shgroup_instance_screen_aligned( DRW_shgroup_instance_format(g_formats.instance_screen_aligned, { {"color", DRW_ATTR_FLOAT, 3}, {"size", DRW_ATTR_FLOAT, 1}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_screen_aligned); @@ -453,7 +453,7 @@ DRWShadingGroup *shgroup_instance_scaled(DRWPass *pass, struct GPUBatch *geom, e DRW_shgroup_instance_format(g_formats.instance_scaled, { {"color", DRW_ATTR_FLOAT, 3}, {"size", DRW_ATTR_FLOAT, 3}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_scaled); @@ -470,7 +470,7 @@ DRWShadingGroup *shgroup_instance(DRWPass *pass, struct GPUBatch *geom, eDRW_Sha DRW_shgroup_instance_format(g_formats.instance_sized, { {"color", DRW_ATTR_FLOAT, 4}, {"size", DRW_ATTR_FLOAT, 1}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_sized); @@ -488,7 +488,7 @@ DRWShadingGroup *shgroup_instance_alpha(DRWPass *pass, struct GPUBatch *geom, eD DRW_shgroup_instance_format(g_formats.instance_sized, { {"color", DRW_ATTR_FLOAT, 4}, {"size", DRW_ATTR_FLOAT, 1}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_sized); @@ -514,7 +514,7 @@ DRWShadingGroup *shgroup_instance_empty_axes(DRWPass *pass, struct GPUBatch *geo DRW_shgroup_instance_format(g_formats.instance_sized, { {"color", DRW_ATTR_FLOAT, 3}, {"size", DRW_ATTR_FLOAT, 1}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_data->empty_axes_sh, pass, geom, g_formats.instance_sized); @@ -532,7 +532,7 @@ DRWShadingGroup *shgroup_instance_outline(DRWPass *pass, struct GPUBatch *geom, DRW_shgroup_instance_format(g_formats.instance_outline, { {"callId", DRW_ATTR_INT, 1}, {"size", DRW_ATTR_FLOAT, 1}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_outline); @@ -550,7 +550,7 @@ DRWShadingGroup *shgroup_camera_instance(DRWPass *pass, struct GPUBatch *geom, e {"corners", DRW_ATTR_FLOAT, 8}, {"depth", DRW_ATTR_FLOAT, 1}, {"tria", DRW_ATTR_FLOAT, 4}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_camera); @@ -569,7 +569,7 @@ DRWShadingGroup *shgroup_distance_lines_instance(DRWPass *pass, struct GPUBatch {"color", DRW_ATTR_FLOAT, 3}, {"start", DRW_ATTR_FLOAT, 1}, {"end", DRW_ATTR_FLOAT, 1}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_distance_lines); @@ -588,7 +588,7 @@ DRWShadingGroup *shgroup_spot_instance(DRWPass *pass, struct GPUBatch *geom, eDR DRW_shgroup_instance_format(g_formats.instance_spot, { {"color", DRW_ATTR_FLOAT, 3}, - {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16} + {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_spot); @@ -612,7 +612,7 @@ DRWShadingGroup *shgroup_instance_bone_axes(DRWPass *pass) DRW_shgroup_instance_format(g_formats.instance_color, { {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, - {"color", DRW_ATTR_FLOAT, 4} + {"color", DRW_ATTR_FLOAT, 4}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -637,7 +637,7 @@ DRWShadingGroup *shgroup_instance_bone_envelope_outline(DRWPass *pass) {"headSphere", DRW_ATTR_FLOAT, 4}, {"tailSphere", DRW_ATTR_FLOAT, 4}, {"outlineColorSize", DRW_ATTR_FLOAT, 4}, - {"xAxis", DRW_ATTR_FLOAT, 3} + {"xAxis", DRW_ATTR_FLOAT, 3}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -661,7 +661,7 @@ DRWShadingGroup *shgroup_instance_bone_envelope_distance(DRWPass *pass) DRW_shgroup_instance_format(g_formats.instance_bone_envelope_distance, { {"headSphere", DRW_ATTR_FLOAT, 4}, {"tailSphere", DRW_ATTR_FLOAT, 4}, - {"xAxis", DRW_ATTR_FLOAT, 3} + {"xAxis", DRW_ATTR_FLOAT, 3}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -686,7 +686,7 @@ DRWShadingGroup *shgroup_instance_bone_envelope_solid(DRWPass *pass, bool transp {"tailSphere", DRW_ATTR_FLOAT, 4}, {"boneColor", DRW_ATTR_FLOAT, 3}, {"stateColor", DRW_ATTR_FLOAT, 3}, - {"xAxis", DRW_ATTR_FLOAT, 3} + {"xAxis", DRW_ATTR_FLOAT, 3}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -710,7 +710,7 @@ DRWShadingGroup *shgroup_instance_mball_handles(DRWPass *pass) DRW_shgroup_instance_format(g_formats.instance_mball_handles, { {"ScaleTranslationMatrix", DRW_ATTR_FLOAT, 12}, {"radius", DRW_ATTR_FLOAT, 1}, - {"color", DRW_ATTR_FLOAT, 3} + {"color", DRW_ATTR_FLOAT, 3}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -736,7 +736,7 @@ DRWShadingGroup *shgroup_instance_bone_shape_outline(DRWPass *pass, struct GPUBa DRW_shgroup_instance_format(g_formats.instance_bone_outline, { {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, - {"outlineColorSize", DRW_ATTR_FLOAT, 4} + {"outlineColorSize", DRW_ATTR_FLOAT, 4}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -759,7 +759,7 @@ DRWShadingGroup *shgroup_instance_bone_shape_solid(DRWPass *pass, struct GPUBatc DRW_shgroup_instance_format(g_formats.instance_bone, { {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, {"boneColor", DRW_ATTR_FLOAT, 3}, - {"stateColor", DRW_ATTR_FLOAT, 3} + {"stateColor", DRW_ATTR_FLOAT, 3}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -782,7 +782,7 @@ DRWShadingGroup *shgroup_instance_bone_sphere_solid(DRWPass *pass, bool transp) DRW_shgroup_instance_format(g_formats.instance_bone, { {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, {"boneColor", DRW_ATTR_FLOAT, 3}, - {"stateColor", DRW_ATTR_FLOAT, 3} + {"stateColor", DRW_ATTR_FLOAT, 3}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -805,7 +805,7 @@ DRWShadingGroup *shgroup_instance_bone_sphere_outline(DRWPass *pass) DRW_shgroup_instance_format(g_formats.instance_bone_outline, { {"InstanceModelMatrix", DRW_ATTR_FLOAT, 16}, - {"outlineColorSize", DRW_ATTR_FLOAT, 4} + {"outlineColorSize", DRW_ATTR_FLOAT, 4}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( @@ -832,7 +832,7 @@ DRWShadingGroup *shgroup_instance_bone_stick(DRWPass *pass) {"wireColor", DRW_ATTR_FLOAT, 4}, /* TODO port theses to uchar color */ {"boneColor", DRW_ATTR_FLOAT, 4}, {"headColor", DRW_ATTR_FLOAT, 4}, - {"tailColor", DRW_ATTR_FLOAT, 4} + {"tailColor", DRW_ATTR_FLOAT, 4}, }); DRWShadingGroup *grp = DRW_shgroup_instance_create( diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 7ce96432ed3..6f745b48737 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -123,7 +123,7 @@ GPUBatch *DRW_draw_background_clipping_batch_from_rv3d(const RegionView3D *rv3d) {4, 7, 6, 5}, {7, 3, 2, 6}, {1, 5, 6, 2}, - {7, 4, 0, 3} + {7, 4, 0, 3}, }; GPUVertBuf *vbo; GPUIndexBuf *el; diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 8592f76322e..78e256039d8 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -519,7 +519,7 @@ static void OBJECT_engine_init(void *vedata) float fov; float viewvecs[2][4] = { {1.0f, -1.0f, -1.0f, 1.0f}, - {-1.0f, 1.0f, -1.0f, 1.0f} + {-1.0f, 1.0f, -1.0f, 1.0f}, }; /* convert the view vectors to view space */ |