diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-02-25 17:23:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-02-26 02:16:21 +0300 |
| commit | e9011100f75c22b3a9c9021fd49fb007efa03ed0 (patch) | |
| tree | 88d482900f643136f8e29f79982ba78541cbf6b0 /source/blender/editors | |
| parent | 3cf2821f2f09d3c55dd88c2b6fb3b26e1ff69a7e (diff) | |
Fix compiler warnings on macOS / clang / c++11.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index ef394899ac4..1c1e6cd3576 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -961,7 +961,7 @@ PreviewImage *UI_icon_to_preview(int icon_id) } static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect), int rw, int rh, - unsigned int *rect, float alpha, const float rgb[3], const bool is_preview) + unsigned int *rect, float alpha, const float rgb[3], const bool UNUSED(is_preview)) { ImBuf *ima = NULL; int draw_w = w; diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 172df71bfc5..bec94fd2cb8 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -364,7 +364,7 @@ static const float cube_wire[24] = { static void drawsolidcube_size(float xsize, float ysize, float zsize) { static VertexFormat format = {0}; - static VertexBuffer vbo = {0}; + static VertexBuffer vbo = {{0}}; static Batch batch = {0}; const float light_vec[3] = {0.0f, 0.0f, 1.0f}; @@ -425,7 +425,7 @@ static void drawsolidcube_size(float xsize, float ysize, float zsize) static void drawcube_size(float xsize, float ysize, float zsize) { static VertexFormat format = {0}; - static VertexBuffer vbo = {0}; + static VertexBuffer vbo = {{0}}; static ElementListBuilder elb = {0}; static ElementList el = {0}; static Batch batch = {0}; @@ -466,7 +466,7 @@ static void drawcube_size(float xsize, float ysize, float zsize) static void draw_bonevert(void) { static VertexFormat format = {0}; - static VertexBuffer vbo = {0}; + static VertexBuffer vbo = {{0}}; static Batch batch = {0}; if (format.attrib_ct == 0) { @@ -582,7 +582,7 @@ static const float bone_octahedral_solid_normals[8][3] = { static void draw_bone_octahedral(void) { static VertexFormat format = {0}; - static VertexBuffer vbo = {0}; + static VertexBuffer vbo = {{0}}; static ElementListBuilder elb = {0}; static ElementList el = {0}; static Batch batch = {0}; @@ -621,7 +621,7 @@ static void draw_bone_octahedral(void) static void draw_bone_solid_octahedral(void) { static VertexFormat format = {0}; - static VertexBuffer vbo = {0}; + static VertexBuffer vbo = {{0}}; static Batch batch = {0}; const float light_vec[3] = {0.0f, 0.0f, 1.0f}; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 8657991d1ba..3d5776e6037 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -110,7 +110,9 @@ #include "view3d_intern.h" /* bad level include */ /* prototypes */ +#ifdef WITH_GAMEENGINE static void imm_draw_box(const float vec[8][3], bool solid, unsigned pos); +#endif /* Workaround for sequencer scene render mode. * @@ -7774,6 +7776,7 @@ static void draw_box(const float vec[8][3], bool solid) glDisableClientState(GL_VERTEX_ARRAY); } +#ifdef WITH_GAMEENGINE static void imm_draw_box(const float vec[8][3], bool solid, unsigned pos) { static const GLubyte quad_indices[24] = {0,1,2,3,7,6,5,4,4,5,1,0,3,2,6,7,3,7,4,0,1,5,6,2}; @@ -7797,6 +7800,7 @@ static void imm_draw_box(const float vec[8][3], bool solid, unsigned pos) } immEnd(); } +#endif static void draw_bb_quadric(BoundBox *bb, char type, bool around_origin) { |