[Bf-blender-cvs] [c855db5] opensubdiv-modifier: Minor tweaks, cast spacing & unused macro

[Campbell Barton]

Commit: c855db59cadf3deafbdf663c56a8fa3755da3dba
Author: Campbell Barton
Date:   Mon Jul 20 20:41:28 2015 +1000
Branches: opensubdiv-modifier
https://developer.blender.org/rBc855db59cadf3deafbdf663c56a8fa3755da3dba

Minor tweaks, cast spacing & unused macro

===================================================================

M	source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
M	source/blender/gpu/intern/gpu_codegen.c
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
index 4688eee..169059d 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv.c
@@ -269,7 +269,7 @@ bool ccgSubSurf_prepareGLMesh(CCGSubSurf *ss, bool use_osd_glsl)
 		glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
 		                      sizeof(GLfloat) * 6, 0);
 		glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
-		                      sizeof(GLfloat) * 6, (float*)12);
+		                      sizeof(GLfloat) * 6, (float *)12);
 
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
 	}
@@ -466,7 +466,7 @@ static void opensubdiv_updateEvaluatorCoarsePositions(CCGSubSurf *ss)
 	}
 
 	openSubdiv_setEvaluatorCoarsePositions(ss->osd_evaluator,
-	                                       (float*)positions,
+	                                       (float *)positions,
 	                                       0,
 	                                       num_basis_verts);
 
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index 8f78dfc..68b9e38 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -862,8 +862,7 @@ static char *code_generate_geometry(ListBase *nodes, bool use_opensubdiv)
 		return code;
 	}
 #else
-	(void) nodes;
-	(void) use_opensubdiv;
+	UNUSED_VARS(nodes, use_opensubdiv);
 #endif
 	return NULL;
 }
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 42c3e04..b2af13a 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -568,7 +568,7 @@ static EnumPropertyItem *rna_userdef_opensubdiv_compute_type_itemf(bContext *UNU
 #define APPEND_COMPUTE(compute) \
 	if (evaluators & OPENSUBDIV_EVALUATOR_## compute) { \
 		RNA_enum_items_add_value(&item, &totitem, opensubdiv_compute_type_items, USER_OPENSUBDIV_COMPUTE_ ## compute); \
-	}
+	} ((void)0)
 
 	APPEND_COMPUTE(CPU);
 	APPEND_COMPUTE(OPENMP);