Commit: cd8a342d7cce97b764123668b2c4edbcd09bdffc
Author: Brecht Van Lommel
Date: Thu Jan 24 07:30:24 2019 +0100
Branches: master
https://developer.blender.org/rBcd8a342d7cce97b764123668b2c4edbcd09bdffc
Cleanup: fix compiler warnings.
===================================================================
M source/blender/draw/intern/draw_builtin_shader.c
M source/blender/draw/modes/paint_vertex_mode.c
===================================================================
diff --git a/source/blender/draw/intern/draw_builtin_shader.c
b/source/blender/draw/intern/draw_builtin_shader.c
index 56bdd652f9f..5c0c005cb9d 100644
--- a/source/blender/draw/intern/draw_builtin_shader.c
+++ b/source/blender/draw/intern/draw_builtin_shader.c
@@ -97,12 +97,14 @@ static GPUShader
*drw_shader_get_builtin_shader_clipped(eGPUBuiltinShader shader
return shader;
}
+#ifndef NDEBUG
static bool drw_shader_get_builtin_shader_test_all(eGPUBuiltinShader shader_id)
{
bool test = false;
drw_shader_get_builtin_shader_clipped(shader_id, &test);
return test;
}
+#endif
GPUShader *DRW_shader_get_builtin_shader(eGPUBuiltinShader shader_id,
eDRW_ShaderSlot slot)
{
@@ -123,6 +125,7 @@ GPUShader *DRW_shader_get_builtin_shader(eGPUBuiltinShader
shader_id, eDRW_Shade
}
else {
BLI_assert(0);
+ return NULL;
}
}
diff --git a/source/blender/draw/modes/paint_vertex_mode.c
b/source/blender/draw/modes/paint_vertex_mode.c
index 9fb307b556d..d63f6216e92 100644
--- a/source/blender/draw/modes/paint_vertex_mode.c
+++ b/source/blender/draw/modes/paint_vertex_mode.c
@@ -85,7 +85,7 @@ typedef struct PAINT_VERTEX_Shaders {
static struct {
PAINT_VERTEX_Shaders sh_data[DRW_SHADER_SLOT_LEN];
-} e_data = {NULL}; /* Engine data */
+} e_data = {{{NULL}}}; /* Engine data */
typedef struct PAINT_VERTEX_PrivateData {
DRWShadingGroup *fvcolor_shgrp;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
