diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-16 21:48:28 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-16 22:21:16 +0300 |
commit | b9af4efe41712680d554a389d771e83c66fce5c4 (patch) | |
tree | f9d674783ad32b3c7dafe7916d9937bd1dbdab73 /source/blender/draw | |
parent | ad390f514bfa33abadfd09e8fd673a0cfee68b39 (diff) |
Cleanup: fix compiler warnings.
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/basic/basic_engine.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_curve_mode.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_lattice_mode.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/overlay_mode.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c index b851a0c4df5..1e8b529c23f 100644 --- a/source/blender/draw/engines/basic/basic_engine.c +++ b/source/blender/draw/engines/basic/basic_engine.c @@ -66,7 +66,7 @@ typedef struct BASIC_Shaders { static struct { BASIC_Shaders sh_data[GPU_SHADER_CFG_LEN]; -} e_data = {NULL}; /* Engine data */ +} e_data = {{{NULL}}}; /* Engine data */ typedef struct BASIC_PrivateData { DRWShadingGroup *depth_shgrp; diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 890181a532a..7c1ef09aaa7 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -2140,7 +2140,7 @@ static void mesh_create_edit_vertex_loops( uchar fflag; /* Static formats */ - static struct { GPUVertFormat sel_id, pos_nor, lnor, flag, uv; } format = { 0 }; + static struct { GPUVertFormat sel_id, pos_nor, lnor, flag, uv; } format = {{ 0 }}; static struct { uint sel_id, pos, nor, lnor, data, uvs; } attr_id; if (format.sel_id.attr_len == 0) { attr_id.sel_id = GPU_vertformat_attr_add(&format.sel_id, "color", GPU_COMP_U32, 1, GPU_FETCH_INT); diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 849087d39af..2d1316f9406 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -41,7 +41,7 @@ ARRAY_SET_ITEMS(v4, (float)r / 255.0f, (float)g / 255.0f, (float)b / 255.0f, (float)a / 255.0f) /* Colors & Constant */ -struct DRW_Global G_draw = {0}; +struct DRW_Global G_draw = {{{0}}}; static bool weight_ramp_custom = false; static ColorBand weight_ramp_copy; diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c index c2841549270..3e6f95f2be9 100644 --- a/source/blender/draw/modes/edit_curve_mode.c +++ b/source/blender/draw/modes/edit_curve_mode.c @@ -86,7 +86,7 @@ typedef struct EDIT_CURVE_Shaders { static struct { EDIT_CURVE_Shaders sh_data[GPU_SHADER_CFG_LEN]; -} e_data = {NULL}; /* Engine data */ +} e_data = {{{NULL}}}; /* Engine data */ typedef struct EDIT_CURVE_PrivateData { /* resulting curve as 'wire' for curves (and optionally normals) */ diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c index 70870292556..9ea76deed3a 100644 --- a/source/blender/draw/modes/edit_lattice_mode.c +++ b/source/blender/draw/modes/edit_lattice_mode.c @@ -99,7 +99,7 @@ static struct { EDIT_LATTICE_Shaders sh_data[GPU_SHADER_CFG_LEN]; -} e_data = {NULL}; /* Engine data */ +} e_data = {{{NULL}}}; /* Engine data */ typedef struct EDIT_LATTICE_PrivateData { /* This keeps the references of the shading groups for diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index 5ba25b16412..4256746aca1 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -122,7 +122,7 @@ static struct { /* temp buffer texture */ struct GPUTexture *occlude_wire_depth_tx; struct GPUTexture *occlude_wire_color_tx; -} e_data = {NULL}; /* Engine data */ +} e_data = {{{NULL}}}; /* Engine data */ typedef struct EDIT_MESH_PrivateData { /* weight */ diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index a2dca50a600..6dacf27ee98 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -82,7 +82,7 @@ typedef struct OVERLAY_Shaders { /* *********** STATIC *********** */ static struct { OVERLAY_Shaders sh_data[GPU_SHADER_CFG_LEN]; -} e_data = {NULL}; +} e_data = {{{NULL}}}; /* Shaders */ extern char datatoc_overlay_face_orientation_frag_glsl[]; |