Commit: 9b0200a1388c8f419851af4feb2232511ad43775
Author: Campbell Barton
Date: Thu Jan 31 08:28:56 2019 +1100
Branches: temp-wm-event-api
https://developer.blender.org/rB9b0200a1388c8f419851af4feb2232511ad43775
Cleanup: trailing commas
Improve clang-format output.
===================================================================
M source/blender/draw/engines/basic/basic_engine.c
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/external/external_engine.c
M source/blender/draw/engines/workbench/workbench_engine.c
M source/blender/draw/intern/draw_builtin_shader.c
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_manager_shader.c
M source/blender/draw/modes/edit_lattice_mode.c
M source/blender/draw/modes/edit_mesh_mode.c
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/overlay_mode.c
M source/blender/draw/modes/paint_vertex_mode.c
M source/blender/draw/modes/paint_weight_mode.c
===================================================================
diff --git a/source/blender/draw/engines/basic/basic_engine.c
b/source/blender/draw/engines/basic/basic_engine.c
index f6a6d89cc40..508cdec3d5a 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -234,7 +234,7 @@ RenderEngineType DRW_engine_viewport_basic_type = {
BASIC_ENGINE, N_("Basic"), RE_INTERNAL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&draw_engine_basic_type,
- {NULL, NULL, NULL}
+ {NULL, NULL, NULL},
};
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c
b/source/blender/draw/engines/eevee/eevee_engine.c
index bb8314a7d75..84148149ded 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -467,7 +467,7 @@ RenderEngineType DRW_engine_viewport_eevee_type = {
NULL, &DRW_render_to_image, NULL, NULL, NULL, NULL,
&EEVEE_render_update_passes,
&draw_engine_eevee_type,
- {NULL, NULL, NULL}
+ {NULL, NULL, NULL},
};
diff --git a/source/blender/draw/engines/external/external_engine.c
b/source/blender/draw/engines/external/external_engine.c
index fee0dda5f21..7a9a1cfa416 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -226,7 +226,7 @@ RenderEngineType DRW_engine_viewport_external_type = {
EXTERNAL_ENGINE, N_("External"), RE_INTERNAL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&draw_engine_external_type,
- {NULL, NULL, NULL}
+ {NULL, NULL, NULL},
};
#undef EXTERNAL_ENGINE
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c
b/source/blender/draw/engines/workbench/workbench_engine.c
index 5d871377c52..487adf994eb 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.c
+++ b/source/blender/draw/engines/workbench/workbench_engine.c
@@ -43,7 +43,7 @@ RenderEngineType DRW_engine_viewport_workbench_type = {
NULL, &DRW_render_to_image, NULL, NULL, NULL, NULL,
&workbench_render_update_passes,
&draw_engine_workbench_solid,
- {NULL, NULL, NULL}
+ {NULL, NULL, NULL},
};
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
*
*/
diff --git a/source/blender/draw/modes/edit_lattice_mode.c
b/source/blender/draw/modes/edit_lattice_mode.c
index 938f8b36e5d..c31d1c26139 100644
--- a/source/blender/draw/modes/edit_lattice_mode.c
+++ b/source/blender/draw/modes/edit_lattice_mode.c
@@ -168,7 +168,8 @@ static void EDIT_LATTICE_engine_init(void *vedata)
datatoc_common_globals_lib_glsl,
datatoc_edit_lattice_overlay_frag_glsl,
NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ });
}
}
diff --git a/source/blender/draw/modes/edit_mesh_mode.c
b/source/blender/draw/modes/edit_mesh_mode.c
index 7f9e0cb9afc..1f43993c538 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -281,7 +281,8 @@ static void EDIT_MESH_engine_init(void *vedata)
sh_data->weight_face = DRW_shader_create_from_arrays({
.vert = (const char *[]){world_clip_lib_or_empty,
datatoc_common_globals_lib_glsl, datatoc_paint_weight_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_common_globals_lib_glsl, datatoc_paint_weight_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ });
}
if (!sh_data->overlay_vert) {
@@ -289,19 +290,22 @@ static void EDIT_MESH_engine_init(void *vedata)
sh_data->overlay_vert = DRW_shader_create_from_arrays({
.vert = (const char *[]){lib,
datatoc_edit_mesh_overlay_points_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_point_varying_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
"#define VERTEX_FACING\n", NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty,
"#define VERTEX_FACING\n", NULL},
+ });
sh_data->overlay_lvert = DRW_shader_create_from_arrays({
.vert = (const char *[]){lib,
datatoc_edit_mesh_overlay_points_vert_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_point_varying_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ });
MEM_freeN(lib);
}
if (!sh_data->overlay_facedot) {
sh_data->overlay_facedot = DRW_shader_create_from_arrays({
.vert = (const char *[]){world_clip_lib_or_empty,
datatoc_common_globals_lib_glsl, datatoc_edit_mesh_overlay_facedot_vert_glsl,
NULL},
.frag = (const char
*[]){datatoc_common_globals_lib_glsl,
datatoc_edit_mesh_overlay_facedot_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
"#define VERTEX_FACING\n", NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty,
"#define VERTEX_FACING\n", NULL},
+ });
}
if (!sh_data->overlay_mix) {
sh_data->overlay_mix =
DRW_shader_create_fullscreen(datatoc_edit_mesh_overlay_mix_frag_glsl, NULL);
@@ -310,28 +314,32 @@ static void EDIT_MESH_engine_init(void *vedata)
sh_data->overlay_facefill = DRW_shader_create_from_arrays({
.vert = (const char *[]){world_clip_lib_or_empty,
datatoc_common_globals_lib_glsl, datatoc_edit_mesh_overlay_facefill_vert_glsl,
NULL},
.frag = (const char
*[]){datatoc_common_globals_lib_glsl,
datatoc_edit_mesh_overlay_facefill_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ });
}
if (!sh_data->normals_face) {
sh_data->normals_face = DRW_shader_create_from_arrays({
.vert = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_normals_vert_glsl, NULL},
.geom = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_normals_geom_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_uniform_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
"#define FACE_NORMALS\n", NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty,
"#define FACE_NORMALS\n", NULL},
+ });
}
if (!sh_data->normals_loop) {
sh_data->normals_loop = DRW_shader_create_from_arrays({
.vert = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_normals_vert_glsl, NULL},
.geom = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_normals_geom_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_uniform_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
"#define LOOP_NORMALS\n", NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty,
"#define LOOP_NORMALS\n", NULL},
+ });
}
if (!sh_data->normals) {
sh_data->normals = DRW_shader_create_from_arrays({
.vert = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_normals_vert_glsl, NULL},
.geom = (const char *[]){world_clip_lib_or_empty,
datatoc_edit_normals_geom_glsl, NULL},
.frag = (const char
*[]){datatoc_gpu_shader_uniform_color_frag_glsl, NULL},
- .defs = (const char *[]){world_clip_def_or_empty,
NULL}});
+ .defs = (const char *[]){world_clip_def_or_empty, NULL},
+ });
}
if (!sh_data->depth) {
sh_data->depth =
DRW_shader_create_3D_depth_only(draw_ctx->shader_slot);
diff --git a/source/blender/draw/modes/object_mode.c
b/source/blender/draw/modes/object_mode.c
index a9286fc0fe0..278aee0b1f8 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -414,12 +414,14 @@ static void OBJECT_engine_init(void *vedata)
sh_data->outline_prepass = DRW_shader_create_from_arrays({
.
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
