Cleanup: warnings

This commit is contained in:
2017-03-09 16:44:11 +11:00
parent a68c631cf8
commit 696ed6d3ca
2 changed files with 5 additions and 1 deletions

View File

@@ -19,6 +19,8 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#if 0
static const char* BuiltinUniform_name(BuiltinUniform u) static const char* BuiltinUniform_name(BuiltinUniform u)
{ {
static const char* names[] = static const char* names[] =
@@ -43,6 +45,8 @@ static const char* BuiltinUniform_name(BuiltinUniform u)
return names[u]; return names[u];
} }
#endif
static bool setup_builtin_uniform(ShaderInput* input, const char* name) static bool setup_builtin_uniform(ShaderInput* input, const char* name)
{ {
// TODO: reject DOUBLE, IMAGE, ATOMIC_COUNTER gl_types // TODO: reject DOUBLE, IMAGE, ATOMIC_COUNTER gl_types

View File

@@ -1687,7 +1687,7 @@ void GPU_end_dupli_object(void)
} }
void GPU_begin_object_materials( void GPU_begin_object_materials(
View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *sl, Object *ob, View3D *v3d, RegionView3D *rv3d, Scene *scene, SceneLayer *UNUSED(sl), Object *ob,
bool glsl, bool *do_alpha_after) bool glsl, bool *do_alpha_after)
{ {
Material *ma; Material *ma;