code cleanup: quiet struct gcc warnings, also use more conventional names for bmesh dissolve.

2 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index bcf86be4e07..fd671446768 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1265,7 +1265,7 @@ void GPU_shader_bind(GPUShader *shader)
 	GPU_print_error("Post Shader Bind");
 }
 
-void GPU_shader_unbind()
+void GPU_shader_unbind(void)
 {
 	GPU_print_error("Pre Shader Unbind");
 	glUseProgramObjectARB(0);
diff --git a/source/blender/gpu/intern/gpu_simple_shader.c b/source/blender/gpu/intern/gpu_simple_shader.c
index 54509d517ee..b29d6c2e681 100644
--- a/source/blender/gpu/intern/gpu_simple_shader.c
+++ b/source/blender/gpu/intern/gpu_simple_shader.c
@@ -70,12 +70,12 @@ static struct {
 
 /* Init / exit */
 
-void GPU_simple_shaders_init()
+void GPU_simple_shaders_init(void)
 {
 	memset(&GPU_MATERIAL_STATE, 0, sizeof(GPU_MATERIAL_STATE));
 }
 
-void GPU_simple_shaders_exit()
+void GPU_simple_shaders_exit(void)
 {
 	int i;
 	
@@ -203,7 +203,7 @@ void GPU_simple_shader_bind(int options)
 	GPU_MATERIAL_STATE.need_normals = (options & GPU_SHADER_LIGHTING);
 }
 
-void GPU_simple_shader_unbind()
+void GPU_simple_shader_unbind(void)
 {
 	if (GPU_glsl_support()) {
 		GPU_shader_unbind();
@@ -234,7 +234,7 @@ void GPU_simple_shader_colors(const float diffuse[3], const float specular[3],
 	glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, CLAMPIS(shininess, 1, 128));
 }
 
-bool GPU_simple_shader_need_normals()
+bool GPU_simple_shader_need_normals(void)
 {
 	return GPU_MATERIAL_STATE.need_normals;
 }