Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-24 09:30:24 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-24 09:41:36 +0300
commitcd8a342d7cce97b764123668b2c4edbcd09bdffc (patch)
tree78eb457b46aad03c962bf4625931c5b1133a28de /source/blender/draw/intern
parent11428e0b7f7aafd3c6fa6b0cd0a77f4c1ff8e48c (diff)
Cleanup: fix compiler warnings.
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r--source/blender/draw/intern/draw_builtin_shader.c3
1 files changed, 3 insertions, 0 deletions
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;
}
}