style cleanup

17 files changed, 35 insertions, 35 deletions

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 0ca73b92071..421821f3a2d 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1288,14 +1288,14 @@ void pbvh_bmesh_print(PBVH *bvh)
 	fprintf(stderr, "bm_face_to_node:\n");
 	GHASH_ITER (gh_iter, bvh->bm_face_to_node) {
 		fprintf(stderr, "  %d -> %d\n",
-		        BM_elem_index_get((BMFace*)BLI_ghashIterator_getKey(&gh_iter)),
+		        BM_elem_index_get((BMFace *)BLI_ghashIterator_getKey(&gh_iter)),
 		        GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter)));
 	}
 
 	fprintf(stderr, "bm_vert_to_node:\n");
 	GHASH_ITER (gh_iter, bvh->bm_vert_to_node) {
 		fprintf(stderr, "  %d -> %d\n",
-		        BM_elem_index_get((BMVert*)BLI_ghashIterator_getKey(&gh_iter)),
+		        BM_elem_index_get((BMVert *)BLI_ghashIterator_getKey(&gh_iter)),
 		        GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter)));
 	}
 
@@ -1307,15 +1307,15 @@ void pbvh_bmesh_print(PBVH *bvh)
 		fprintf(stderr, "node %d\n  faces:\n", n);
 		GHASH_ITER (gh_iter, node->bm_faces)
 			fprintf(stderr, "    %d\n",
-			        BM_elem_index_get((BMFace*)BLI_ghashIterator_getKey(&gh_iter)));
+			        BM_elem_index_get((BMFace *)BLI_ghashIterator_getKey(&gh_iter)));
 		fprintf(stderr, "  unique verts:\n");
 		GHASH_ITER (gh_iter, node->bm_unique_verts)
 			fprintf(stderr, "    %d\n",
-			        BM_elem_index_get((BMVert*)BLI_ghashIterator_getKey(&gh_iter)));
+			        BM_elem_index_get((BMVert *)BLI_ghashIterator_getKey(&gh_iter)));
 		fprintf(stderr, "  other verts:\n");
 		GHASH_ITER (gh_iter, node->bm_other_verts)
 			fprintf(stderr, "    %d\n",
-			        BM_elem_index_get((BMVert*)BLI_ghashIterator_getKey(&gh_iter)));
+			        BM_elem_index_get((BMVert *)BLI_ghashIterator_getKey(&gh_iter)));
 	}
 }
 
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index b9352a25063..55a22fd3613 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -756,7 +756,7 @@ void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx)
 		BM_ITER_MESH (ed, &iter, bm, BM_EDGES_OF_MESH) {
 			if (vptr_map) {
 /*				printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void *)ed->v1));*/
-/*				printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void* )ed->v2));*/
+/*				printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void *)ed->v2));*/
 				ed->v1 = BLI_ghash_lookup(vptr_map, (const void *)ed->v1);
 				ed->v2 = BLI_ghash_lookup(vptr_map, (const void *)ed->v2);
 			}
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index 4041fc2c755..d235aaaa622 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -1087,7 +1087,7 @@ void BM_face_legal_splits(BMesh *bm, BMFace *f, BMLoop *(*loops)[2], int len)
  * Small utility functions for fast access
  *
  * faster alternative to:
- *  BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 3);
+ *  BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 3);
  */
 void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3])
 {
@@ -1102,7 +1102,7 @@ void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3])
 
 /**
  * faster alternative to:
- *  BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 4);
+ *  BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 4);
  */
 void BM_face_as_array_vert_quad(BMFace *f, BMVert *r_verts[4])
 {
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 48958fbfc90..89bcebc41d6 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -184,7 +184,7 @@ void AnimationExporter::make_anim_frames_from_targets(Object *ob, std::vector<fl
 	ListBase *conlist = get_active_constraints(ob);
 	if (conlist == NULL) return;
 	bConstraint *con;
-	for (con = (bConstraint*)conlist->first; con; con = con->next) {
+	for (con = (bConstraint *)conlist->first; con; con = con->next) {
 		ListBase targets = {NULL, NULL};
 		
 		bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
@@ -200,7 +200,7 @@ void AnimationExporter::make_anim_frames_from_targets(Object *ob, std::vector<fl
 			 */
 			cti->get_constraint_targets(con, &targets);
 			if (cti) {
-				for (ct = (bConstraintTarget*)targets.first; ct; ct = ct->next) {
+				for (ct = (bConstraintTarget *)targets.first; ct; ct = ct->next) {
 					obtar = ct->tar;
 					find_frames(obtar, frames);
 				}
@@ -544,7 +544,7 @@ void AnimationExporter::dae_baked_object_animation(std::vector<float> &fra, Obje
 	if (!fra.size())
 		return;
 
-	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s", (char*)translate_id(ob_name).c_str(),
+	BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s", (char *)translate_id(ob_name).c_str(),
 	             "object_matrix");
 
 	openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
@@ -1535,7 +1535,7 @@ void AnimationExporter::calc_ob_mat_at_time(Object *ob, float ctime , float mat[
 {
 	ListBase *conlist = get_active_constraints(ob);
 	bConstraint *con;
-	for (con = (bConstraint*)conlist->first; con; con = con->next) {
+	for (con = (bConstraint *)conlist->first; con; con = con->next) {
 		ListBase targets = {NULL, NULL};
 		
 		bConstraintTypeInfo *cti = BKE_constraint_get_typeinfo(con);
@@ -1544,7 +1544,7 @@ void AnimationExporter::calc_ob_mat_at_time(Object *ob, float ctime , float mat[
 			bConstraintTarget *ct;
 			Object *obtar;
 			cti->get_constraint_targets(con, &targets);
-			for (ct = (bConstraintTarget*)targets.first; ct; ct = ct->next) {
+			for (ct = (bConstraintTarget *)targets.first; ct; ct = ct->next) {
 				obtar = ct->tar;
 				BKE_animsys_evaluate_animdata(scene, &obtar->id, obtar->adt, ctime, ADT_RECALC_ANIM);
 				BKE_object_where_is_calc_time(scene, obtar, ctime);
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index ed84dee046f..0f8a4e5af76 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -674,7 +674,7 @@ void ArmatureImporter::make_shape_keys()
 		
 		if (source_ob) {
 
-			Mesh *source_me = (Mesh*) source_ob->data;
+			Mesh *source_me = (Mesh *)source_ob->data;
 			//insert key to source mesh
 			Key *key = source_me->key = BKE_key_add((ID *)source_me);
 			key->type = KEY_RELATIVE;
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp
index 35fcc926bea..71a16df3b26 100644
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/collada/ControllerExporter.cpp
@@ -352,7 +352,7 @@ std::string ControllerExporter::add_morph_targets(Key *key, Object *ob)
 
 	source.prepareToAppendValues();
 
-	KeyBlock * kb = (KeyBlock*)key->block.first;
+	KeyBlock *kb = (KeyBlock *)key->block.first;
 	//skip the basis
 	kb = kb->next;
 	for (; kb; kb = kb->next) {
@@ -381,7 +381,7 @@ std::string ControllerExporter::add_morph_weights(Key *key, Object *ob)
 	
 	source.prepareToAppendValues();
 
-	KeyBlock * kb = (KeyBlock*)key->block.first;
+	KeyBlock *kb = (KeyBlock *)key->block.first;
 	//skip the basis
 	kb = kb->next;
 	for (; kb; kb = kb->next) {
@@ -399,7 +399,7 @@ void ControllerExporter::add_weight_extras(Key *key)
 	// can also try the base element and param alternative
 	COLLADASW::BaseExtraTechnique extra;
 	
-	KeyBlock * kb = (KeyBlock*)key->block.first;
+	KeyBlock * kb = (KeyBlock *)key->block.first;
 	//skip the basis
 	kb = kb->next;
 	for (; kb; kb = kb->next) {
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp
index 6644c46ac86..669b787062a 100644
--- a/source/blender/collada/GeometryExporter.cpp
+++ b/source/blender/collada/GeometryExporter.cpp
@@ -155,7 +155,7 @@ void GeometryExporter::operator()(Object *ob)
 	if (this->export_settings->include_shapekeys) {
 		Key * key = BKE_key_from_object(ob);
 		if (key) {
-			KeyBlock * kb = (KeyBlock*)key->block.first;
+			KeyBlock * kb = (KeyBlock *)key->block.first;
 			//skip the basis
 			kb = kb->next;
 			for (; kb; kb = kb->next) {
diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp
index f3844be525e..89f8bb3226b 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -190,7 +190,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
 	}
 
 	if (ob->constraints.first != NULL ) {
-		bConstraint *con = (bConstraint*) ob->constraints.first;
+		bConstraint *con = (bConstraint *) ob->constraints.first;
 		while (con) {
 			std::string con_name(id_name(con));
 			std::string con_tag = con_name + "_constraint";
@@ -216,7 +216,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
 			
 				cti->get_constraint_targets(con, &targets);
 				if (cti) {
-					for (ct = (bConstraintTarget*)targets.first; ct; ct = ct->next) {
+					for (ct = (bConstraintTarget *)targets.first; ct; ct = ct->next) {
 						obtar = ct->tar;
 						std::string tar_id(id_name(obtar));
 						colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"target_id",tar_id);
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 144dfa948d0..d94b9372560 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -614,8 +614,8 @@ void PAINT_OT_image_paint(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
 
 	RNA_def_enum(ot->srna, "mode", stroke_mode_items, BRUSH_STROKE_NORMAL,
-				 "Paint Stroke Mode",
-				 "Action taken when a paint stroke is made");
+	             "Paint Stroke Mode",
+	             "Action taken when a paint stroke is made");
 
 	RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index d6a3a6a6a3f..d2cc42b0a56 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1129,7 +1129,7 @@ void drawnodespace(const bContext *C, ARegion *ar, View2D *v2d)
 	
 	if (snode->nodetree) {
 		bNode *node;
-		/* void** highlights = 0; */ /* UNUSED */
+		/* void **highlights = 0; */ /* UNUSED */
 		
 		node_uiblocks_init(C, snode->nodetree);
 		
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 51f2659fccd..d18ec225c5f 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2247,7 +2247,7 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (*func)(void *), boo
 	
 	/* Setting these temporarily is not nice */
 	v3d->flag &= ~V3D_SELECT_OUTLINE;
-	U.glalphaclip = alphaoverride ? 0.5 : glalphaclip; /* not that nice but means we wont zoom into billboards */
+	U.glalphaclip = alphaoverride ? 0.5f : glalphaclip; /* not that nice but means we wont zoom into billboards */
 	U.obcenter_dia = 0;
 	
 	setwinmatrixview3d(ar, v3d, NULL);
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 91e98181ab9..8d425f98a25 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -104,7 +104,7 @@ typedef struct IDProperty {
 /* 2 characters for ID code and 64 for actual name */
 #define MAX_ID_NAME	66
 
-/* There's a nasty circular dependency here.... void* to the rescue! I
+/* There's a nasty circular dependency here.... 'void *' to the rescue! I
  * really wonder why this is needed. */
 typedef struct ID {
 	void *next, *prev;
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 933b7a78b59..e7c030d5cdf 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -341,7 +341,7 @@ static StructRNA *rna_NodeSocket_refine(PointerRNA *ptr)
 		
 		#define SUBTYPE(socktype, stypename, id, idname) \
 		{ \
-			bNodeSocketValue##stypename * value = (bNodeSocketValue##stypename *)sock->default_value; \
+			bNodeSocketValue##stypename *value = (bNodeSocketValue##stypename *)sock->default_value; \
 			if (value->subtype == PROP_##id) \
 				return &RNA_NodeSocket##stypename##idname; \
 		}
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m
index 4a8a06134c8..7e7c986c6ea 100644
--- a/source/blender/quicktime/apple/qtkit_export.m
+++ b/source/blender/quicktime/apple/qtkit_export.m
@@ -295,8 +295,8 @@ static OSStatus AudioConverterInputCallback(AudioConverterRef inAudioConverter,
 	
 	qtexport->audioTotalExportedFrames += *ioNumberDataPackets;
 	
-	AUD_readDevice(qtexport->audioInputDevice, (UInt8*)qtexport->audioInputBuffer, 
-				   qtexport->audioInputFormat.mFramesPerPacket * *ioNumberDataPackets);
+	AUD_readDevice(qtexport->audioInputDevice, (UInt8 *)qtexport->audioInputBuffer,
+	               qtexport->audioInputFormat.mFramesPerPacket * *ioNumberDataPackets);
 	
 	ioData->mBuffers[0].mDataByteSize = qtexport->audioInputFormat.mBytesPerPacket * *ioNumberDataPackets;
 	ioData->mBuffers[0].mData = qtexport->audioInputBuffer;
@@ -357,7 +357,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R
 
 			tmpnam(name);
 			strcat(name, extension);
-			outputFileURL = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,(UInt8*) name, strlen(name), false);
+			outputFileURL = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,(UInt8 *)name, strlen(name), false);
 			
 			if (outputFileURL) {
 				
diff --git a/source/blender/render/intern/raytrace/rayobject_internal.h b/source/blender/render/intern/raytrace/rayobject_internal.h
index aa8ab8c3da4..07a1cd26c47 100644
--- a/source/blender/render/intern/raytrace/rayobject_internal.h
+++ b/source/blender/render/intern/raytrace/rayobject_internal.h
@@ -103,12 +103,12 @@ int RE_rayobjectcontrol_test_break(RayObjectControl *c);
 #define RE_rayobject_isVlakPrimitive(o)	((((intptr_t)o)&3) == 3)
 
 /* used to align a given ray object */
-#define RE_rayobject_align(o)					((RayObject*)(((intptr_t)o)&(~3)))
+#define RE_rayobject_align(o)					((RayObject *)(((intptr_t)o)&(~3)))
 
 /* used to unalign a given ray object */
-#define RE_rayobject_unalignRayFace(o)			((RayObject*)(((intptr_t)o)|1))
-#define RE_rayobject_unalignRayAPI(o)			((RayObject*)(((intptr_t)o)|2))
-#define RE_rayobject_unalignVlakPrimitive(o)	((RayObject*)(((intptr_t)o)|3))
+#define RE_rayobject_unalignRayFace(o)			((RayObject *)(((intptr_t)o)|1))
+#define RE_rayobject_unalignRayAPI(o)			((RayObject *)(((intptr_t)o)|2))
+#define RE_rayobject_unalignVlakPrimitive(o)	((RayObject *)(((intptr_t)o)|3))
 
 /*
  * This rayobject represents a generic object. With it's own callbacks for raytrace operations.
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 3c4eb814d79..e67c8520e75 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1484,7 +1484,7 @@ static void tag_scenes_for_render(Render *re)
 			if (node->id) {
 				if (!MAIN_VERSION_ATLEAST(re->main, 265, 5)) {
 					if (rlayer_node_uses_alpha(re->scene->nodetree, node)) {
-						Scene *scene = (Scene*) node->id;
+						Scene *scene = (Scene *)node->id;
 
 						if (scene->r.alphamode != R_ALPHAPREMUL) {
 							BKE_reportf(re->reports, RPT_WARNING, "Setting scene %s alpha mode to Premul", scene->id.name + 2);
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index 0a8af1c368b..8169250f74f 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -938,7 +938,7 @@ HaloRen *RE_findOrAddHalo(ObjectRen *obr, int nr)
 		//	TABLEINITSIZE, obr->blohalen+TABLEINITSIZE );
 		temp=obr->bloha;
 		
-		obr->bloha = (HaloRen**)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha");
+		obr->bloha = (HaloRen **)MEM_callocN(sizeof(void *) * (obr->blohalen + TABLEINITSIZE), "Bloha");
 		if (temp) memcpy(obr->bloha, temp, obr->blohalen*sizeof(void *));
 		memset(&(obr->bloha[obr->blohalen]), 0, TABLEINITSIZE * sizeof(void *));
 		obr->blohalen+=TABLEINITSIZE;  /*Does this really need to be power of 2?*/