diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-31 00:28:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-31 00:30:45 +0300 |
| commit | da1da3053d759074b70130082289c0323ba2f901 (patch) | |
| tree | 75023ce297b13c48e9c8eb9fe38183e12110c29c /source/blender/draw/intern | |
| parent | b21bd431e3a50c79d9db549254141fe7ffa311a7 (diff) | |
Cleanup: add trailing commas
Improve clang-format output.
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_builtin_shader.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager_shader.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_builtin_shader.c b/source/blender/draw/intern/draw_builtin_shader.c index 2c3d656da2c..2c57ae2703f 100644 --- a/source/blender/draw/intern/draw_builtin_shader.c +++ b/source/blender/draw/intern/draw_builtin_shader.c @@ -79,7 +79,8 @@ static GPUShader *drw_shader_get_builtin_shader_clipped(eGPUBuiltinShader shader .vert = (const char *[]){world_clip_lib, shader_code.vert, NULL}, .geom = (const char *[]){shader_code.geom ? world_clip_lib : NULL, shader_code.geom, NULL}, .frag = (const char *[]){shader_code.frag, NULL}, - .defs = (const char *[]){world_clip_def, shader_code.defs, NULL}}); + .defs = (const char *[]){world_clip_def, shader_code.defs, NULL}, + }); } GPUShader *DRW_shader_get_builtin_shader(eGPUBuiltinShader shader_id, eDRW_ShaderSlot slot) diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 676c401cf44..826e62fb590 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -513,7 +513,8 @@ DRWShadingGroup *shgroup_instance_empty_axes(DRWPass *pass, struct GPUBatch *geo sh_data->empty_axes_sh = DRW_shader_create_from_arrays({ .vert = (const char *[]){world_clip_lib_or_empty, datatoc_object_empty_axes_vert_glsl, NULL}, .frag = (const char *[]){datatoc_gpu_shader_flat_color_frag_glsl, NULL}, - .defs = (const char *[]){world_clip_def_or_empty, NULL}}); + .defs = (const char *[]){world_clip_def_or_empty, NULL}, + }); } DRW_shgroup_instance_format(g_formats.instance_sized, { diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index 67bf195e136..300e99d77de 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -311,7 +311,8 @@ static const char *string_join_array_maybe_alloc(const char **str_arr, bool *r_i * .vert = (const char *[]){shader_lib_glsl, shader_vert_glsl, NULL}, * .geom = (const char *[]){shader_geom_glsl, NULL}, * .frag = (const char *[]){shader_frag_glsl, NULL}, - * .defs = (const char *[]){"#define DEFINE\n", test ? "#define OTHER_DEFINE\n" : "", NULL}}); + * .defs = (const char *[]){"#define DEFINE\n", test ? "#define OTHER_DEFINE\n" : "", NULL}, + * }); * \endcode * */ |