[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55207] trunk/blender/source/blender: code cleanup: quiet struct gcc warnings, also use more conventional names for bmesh dissolve.

[Campbell Barton]

Revision: 55207
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55207
Author:   campbellbarton
Date:     2013-03-12 08:50:02 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
code cleanup: quiet struct gcc warnings, also use more conventional names for bmesh dissolve.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c
    trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c	2013-03-12 08:46:12 UTC (rev 55206)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_dissolve.c	2013-03-12 08:50:02 UTC (rev 55207)
@@ -114,14 +114,14 @@
 			    /* check twice because cumulative effect could dissolve over angle limit */
 			    (BM_edge_calc_face_angle(e) < angle_limit))
 			{
-				BMFace *nf = BM_faces_join_pair(bm, e->l->f,
-				                                e->l->radial_next->f,
-				                                e,
-				                                false); /* join faces */
+				BMFace *f_new = BM_faces_join_pair(bm, e->l->f,
+				                                   e->l->radial_next->f,
+				                                   e,
+				                                   false); /* join faces */
 
 				/* there may be some errors, we don't mind, just move on */
-				if (nf) {
-					BM_face_normal_update(nf);
+				if (f_new) {
+					BM_face_normal_update(f_new);
 				}
 				else {
 					BMO_error_clear(bm);

Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2013-03-12 08:46:12 UTC (rev 55206)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c	2013-03-12 08:50:02 UTC (rev 55207)
@@ -1265,7 +1265,7 @@
 	GPU_print_error("Post Shader Bind");
 }
 
-void GPU_shader_unbind()
+void GPU_shader_unbind(void)
 {
 	GPU_print_error("Pre Shader Unbind");
 	glUseProgramObjectARB(0);

Modified: trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c	2013-03-12 08:46:12 UTC (rev 55206)
+++ trunk/blender/source/blender/gpu/intern/gpu_simple_shader.c	2013-03-12 08:50:02 UTC (rev 55207)
@@ -70,12 +70,12 @@
 
 /* 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 @@
 	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 @@
 	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;
 }