style cleanup: whitespace/indentation

43 files changed, 94 insertions, 92 deletions

diff --git a/source/blender/avi/intern/avirgb.c b/source/blender/avi/intern/avirgb.c
index 78316990d54..7a95972845a 100644
--- a/source/blender/avi/intern/avirgb.c
+++ b/source/blender/avi/intern/avirgb.c
@@ -59,7 +59,7 @@ void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buf
 		unsigned char *to;
 #ifdef __BIG_ENDIAN__
 		unsigned char  *pxla;
-#endif		  
+#endif
 		
 		buf = MEM_mallocN(movie->header->Height * movie->header->Width * 3, "fromavirgbbuf");
 
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 0f8716e2b04..233647c9ec6 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -247,7 +247,7 @@ void set_active_action_group(bAction *act, bActionGroup *agrp, short select)
 	for (grp = act->groups.first; grp; grp = grp->next) {
 		if ((grp == agrp) && (select))
 			grp->flag |= AGRP_ACTIVE;
-		else	
+		else
 			grp->flag &= ~AGRP_ACTIVE;
 	}
 }
@@ -958,7 +958,7 @@ short action_get_item_transforms(bAction *act, Object *ob, bPoseChannel *pchan,
 		RNA_pointer_create((ID *)ob, &RNA_PoseBone, pchan, &ptr);
 	else if (ob)
 		RNA_id_pointer_create((ID *)ob, &ptr);
-	else	
+	else
 		return 0;
 		
 	/* get the basic path to the properties of interest */
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 6198a119ac4..f73221066b1 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -452,7 +452,7 @@ void animviz_calc_motionpaths(Scene *scene, ListBase *targets)
 		/* get pointer to animviz settings for each target */
 		if (mpt->pchan)
 			avs = &mpt->ob->pose->avs;
-		else	
+		else
 			avs = &mpt->ob->avs;
 		
 		/* clear the flag requesting recalculation of targets */
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index cc49652d6e5..65294e3e5f5 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -636,9 +636,9 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 			else {
 				if (index) {
 					orig = *index++;
-					if (orig == ORIGINDEX_NONE)     { if (nors) nors += 3; continue; }
-					if (drawParamsMapped) draw_option = drawParamsMapped(userData, orig);
-					else {    if (nors) nors += 3; continue; }
+					if (orig == ORIGINDEX_NONE) { if (nors) nors += 3; continue; }
+					if (drawParamsMapped)       { draw_option = drawParamsMapped(userData, orig); }
+					else                        { if (nors) nors += 3; continue; }
 				}
 				else
 				if (drawParamsMapped) draw_option = drawParamsMapped(userData, i);
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index d526ce7afdc..f8b8efdf7eb 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -575,16 +575,16 @@ static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene)
 		brushObj = NULL;
 
 		/* select object */
-		if (surface->brush_group) {						
+		if (surface->brush_group) {
 			if (go->ob) brushObj = go->ob;
-		}					
-		else						
+		}
+		else
 			brushObj = base->object;
 
 		if (!brushObj) {
 			if (surface->brush_group) go = go->next;
 			else base = base->next;
-			continue;			
+			continue;
 		}
 
 		if (surface->brush_group)
@@ -3569,7 +3569,7 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
 	tree = BLI_kdtree_new(psys->totpart);
 
 	/* loop through particles and insert valid ones	to the tree	*/
-	for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++)   {
+	for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) {
 
 		/* Proceed only if particle is active	*/
 		if (pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN) == 0) continue;
@@ -4805,17 +4805,17 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su
 		while (base || go) {
 			brushObj = NULL;
 			/* select object */
-			if (surface->brush_group) {						
+			if (surface->brush_group) {
 				if (go->ob) brushObj = go->ob;
-			}					
-			else						
+			}
+			else
 				brushObj = base->object;
 
-			if (!brushObj) {			
+			if (!brushObj) {
 				/* skip item */
 				if (surface->brush_group) go = go->next;
 				else base = base->next;
-				continue;			
+				continue;
 			}
 
 			/* next item */
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 07c5d6d0329..87e35bc2747 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -634,7 +634,7 @@ makebreak:
 		 * But if the font is FO_BUILTIN_NAME then do not try loading since
 		 * whole font is in the memory already
 		 */
-		if (che == NULL && strcmp(vfont->name, FO_BUILTIN_NAME))    {
+		if (che == NULL && strcmp(vfont->name, FO_BUILTIN_NAME)) {
 			BLI_vfontchar_from_freetypefont(vfont, ascii);
 		}
 
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 2b21758fdc1..e9ee91505de 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -438,7 +438,7 @@ static char get_largest_axis(float *bv)
 	middle_point[0] = (bv[1]) - (bv[0]); // x axis
 	middle_point[1] = (bv[3]) - (bv[2]); // y axis
 	middle_point[2] = (bv[5]) - (bv[4]); // z axis
-	if (middle_point[0] > middle_point[1])  {
+	if (middle_point[0] > middle_point[1]) {
 		if (middle_point[0] > middle_point[2])
 			return 1;  // max x axis
 		else
@@ -464,7 +464,7 @@ static void node_join(BVHTree *tree, BVHNode *node)
 	}
 	
 	for (i = 0; i < tree->tree_type; i++) {
-		if (node->children[i])  {
+		if (node->children[i]) {
 			for (j = tree->start_axis; j < tree->stop_axis; j++) {
 				// update minimum 
 				if (node->children[i]->bv[(2 * j)] < node->bv[(2 * j)]) 
diff --git a/source/blender/blenlib/intern/fnmatch.c b/source/blender/blenlib/intern/fnmatch.c
index 53172957560..e29f31897c0 100644
--- a/source/blender/blenlib/intern/fnmatch.c
+++ b/source/blender/blenlib/intern/fnmatch.c
@@ -235,7 +235,7 @@ fnmatch (const char *pattern, const char *string, int flags)
 # undef FOLD
 }
 
-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
+#endif /* _LIBC or not __GNU_LIBRARY__.  */
 
 #else
 
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 59147040fd8..49a6cbcc249 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1920,7 +1920,7 @@ static void BLI_where_is_temp(char *fullname, const size_t maxlen, char *userdir
 			BLI_strncpy(fullname, tmp, maxlen);
 		}
 	}
-#endif	
+#endif
 	
 	if (fullname[0] == '\0') {
 		BLI_strncpy(fullname, "/tmp/", maxlen);
diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c
index efb5ca98185..e34150ee4f2 100644
--- a/source/blender/blenlib/intern/winstuff.c
+++ b/source/blender/blenlib/intern/winstuff.c
@@ -158,7 +158,7 @@ void RegisterBlendExtension(void)
 		ThumbHandlerDLL = "BlendThumb64.dll";
 	else
 		ThumbHandlerDLL = "BlendThumb.dll";
-#endif	
+#endif
 	snprintf(RegCmd, MAX_PATH * 2, "%s\\regsvr32 /s \"%s\\%s\"", SysDir, InstallDir, ThumbHandlerDLL);
 	system(RegCmd);
 
diff --git a/source/blender/compositor/operations/COM_MapUVOperation.h b/source/blender/compositor/operations/COM_MapUVOperation.h
index 069f454895d..4d7bc814dc2 100644
--- a/source/blender/compositor/operations/COM_MapUVOperation.h
+++ b/source/blender/compositor/operations/COM_MapUVOperation.h
@@ -57,6 +57,6 @@ public:
 	 */
 	void deinitExecution();
 
-	void setAlpha(float alpha){this->alpha = alpha;}
+	void setAlpha(float alpha) { this->alpha = alpha; }
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl b/source/blender/compositor/operations/COM_OpenCLKernels.cl
index d462f5d8250..40932e54bc7 100644
--- a/source/blender/compositor/operations/COM_OpenCLKernels.cl
+++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl
@@ -1,6 +1,7 @@
 /// This file contains all opencl kernels for node-operation implementations 
 
-__kernel void testKernel(__global __write_only image2d_t output){
+__kernel void testKernel(__global __write_only image2d_t output)
+{
 	int x = get_global_id(0);
 	int y = get_global_id(1);
 	int2 coords = {x, y}; 
diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp b/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
index 66db4a1c86b..1024d460044 100644
--- a/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
+++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
@@ -3,7 +3,8 @@
 
 const char *sourcecode = "/// This file contains all opencl kernels for node-operation implementations \n" \
 "\n" \
-"__kernel void testKernel(__global __write_only image2d_t output) {\n" \
+"__kernel void testKernel(__global __write_only image2d_t output)\n" \
+"{\n" \
 "	int x = get_global_id(0);\n" \
 "	int y = get_global_id(1);\n" \
 "	int2 coords = {x, y}; \n" \
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 0514700e120..ddc4f4d943c 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -191,7 +191,7 @@ static void draw_cfra_number(Scene *scene, View2D *v2d, float cfra, short time)
 	 */
 	if (time)
 		ANIM_timecode_string_from_frame(&numstr[4], scene, 0, time, FRA2TIME(cfra));
-	else	
+	else
 		ANIM_timecode_string_from_frame(&numstr[4], scene, 1, time, cfra);
 	slen = (short)UI_GetStringWidth(numstr) - 1;
 	
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index ac5af846900..546ab0e4396 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -3653,7 +3653,7 @@ static int armature_switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
 				ebo->parent = child;
 				if ((child) && equals_v3v3(ebo->head, child->tail))
 					ebo->flag |= BONE_CONNECTED;
-				else	
+				else
 					ebo->flag &= ~BONE_CONNECTED;
 				
 				/* get next bones 
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c
index 80f8c61694c..d90bd96a6f1 100644
--- a/source/blender/editors/armature/editarmature_retarget.c
+++ b/source/blender/editors/armature/editarmature_retarget.c
@@ -733,7 +733,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
 		
 		/* DO SOME MAGIC HERE */
 		for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-			for (con = pchan->constraints.first; con; con = con->next)  {
+			for (con = pchan->constraints.first; con; con = con->next) {
 				bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
 				ListBase targets = {NULL, NULL};
 				bConstraintTarget *ct;
@@ -858,7 +858,7 @@ static void RIG_reconnectControlBones(RigGraph *rg)
 				
 				/* DO SOME MAGIC HERE */
 				for (pchan = rg->ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-					for (con = pchan->constraints.first; con; con = con->next)  {
+					for (con = pchan->constraints.first; con; con = con->next) {
 						bConstraintTypeInfo *cti = constraint_get_typeinfo(con);
 						ListBase targets = {NULL, NULL};
 						bConstraintTarget *ct;
diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c
index f18fa2f8bf8..df970171a54 100644
--- a/source/blender/editors/armature/poseobject.c
+++ b/source/blender/editors/armature/poseobject.c
@@ -1136,7 +1136,7 @@ static bPoseChannel *pose_bone_do_paste(Object *ob, bPoseChannel *chan, short se
 			/* quat/euler to axis angle */
 			if (chan->rotmode > 0)
 				eulO_to_axis_angle(pchan->rotAxis, &pchan->rotAngle, chan->eul, chan->rotmode);
-			else	
+			else
 				quat_to_axis_angle(pchan->rotAxis, &pchan->rotAngle, chan->quat);
 		}
 		else {
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 5c23aba9024..6ffe3f1feeb 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -214,7 +214,7 @@ static void gp_get_3d_reference(tGPsdata *p, float vec[3])
 		sub_v3_v3v3(vec, fp, ob->loc);
 	}
 	else
-#endif	
+#endif
 	{
 		/* use 3D-cursor */
 		copy_v3_v3(vec, fp);
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 2eea7f50f33..1d315e9a5b8 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -1442,7 +1442,7 @@ View2DScrollers *UI_view2d_scrollers_calc(const bContext *C, View2D *v2d, short
 				v2d->scroll |= V2D_SCROLL_HORIZONTAL_FULLR;
 				scrollers->horfull = 1;
 			}
-			else	
+			else
 				v2d->scroll &= ~V2D_SCROLL_HORIZONTAL_FULLR;
 		}
 	}
@@ -1484,7 +1484,7 @@ View2DScrollers *UI_view2d_scrollers_calc(const bContext *C, View2D *v2d, short
 				v2d->scroll |= V2D_SCROLL_VERTICAL_FULLR;
 				scrollers->vertfull = 1;
 			}
-			else	
+			else
 				v2d->scroll &= ~V2D_SCROLL_VERTICAL_FULLR;
 		}
 	}
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index d9d5852eb6d..c8ca75835e4 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -540,7 +540,7 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length)
 		fsmesh.volumeInitType = fluidmd->fss->volumeInitType;
 		fsmesh.obstacleImpactFactor = fluidmd->fss->surfaceSmoothing; // misused value
 		
-		if (fsmesh.type == OB_FLUIDSIM_CONTROL)	{
+		if (fsmesh.type == OB_FLUIDSIM_CONTROL) {
 			fsmesh.cpsTimeStart = fluidmd->fss->cpsTimeStart;
 			fsmesh.cpsTimeEnd = fluidmd->fss->cpsTimeEnd;
 			fsmesh.cpsQuality = fluidmd->fss->cpsQuality;
@@ -708,7 +708,7 @@ static int fluid_init_filepaths(Object *fsDomain, char *targetDir, char *targetF
 		strncpy(domainSettings->surfdataPath, newSurfdataPath, FILE_MAXDIR);
 		BLI_path_abs(targetDir, G.main->name); // fixed #frame-no 
 	}
-#endif	
+#endif
 	return outStringsChanged;
 }
 
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 9629fd7da0c..4bb5a21cb3d 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -241,7 +241,7 @@ static int file_border_select_modal(bContext *C, wmOperator *op, wmEvent *event)
 
 	result=	WM_border_select_modal(C, op, event);
 
-	if (result==OPERATOR_RUNNING_MODAL)	{
+	if (result == OPERATOR_RUNNING_MODAL) {
 
 		rect.xmin = RNA_int_get(op->ptr, "xmin");
 		rect.ymin = RNA_int_get(op->ptr, "ymin");
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 096c16298e3..a6578ffb3f7 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -695,7 +695,7 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View
 					if (((nlt->flag & NLATRACK_ACTIVE) && (nlt->flag & NLATRACK_DISABLED)) == 0) {
 						if (nlt->flag & NLATRACK_MUTED)
 							mute = ICON_MUTE_IPO_ON;
-						else	
+						else
 							mute = ICON_MUTE_IPO_OFF;
 							
 						if (EDITABLE_NLT(nlt))
diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c
index 6c683eba085..248f73b9ab6 100644
--- a/source/blender/editors/space_userpref/space_userpref.c
+++ b/source/blender/editors/space_userpref/space_userpref.c
@@ -149,7 +149,7 @@ static void userpref_header_listener(ARegion *UNUSED(ar), wmNotifier *UNUSED(wmn
 		default:
 			break;
 	}
-#endif	
+#endif
 }
 
 /* only called once, from space/spacetypes.c */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index f18ba29b1f4..f63116a1f60 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3005,7 +3005,7 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha
 	
 	if (U.uiflag & USER_SHOW_ROTVIEWICON)
 		draw_view_axis(rv3d);
-	else	
+	else
 		draw_view_icon(rv3d);
 	
 	ob = OBACT;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 4573e66ca39..b0a4f5bbfde 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2311,8 +2311,8 @@ int handleEventWarp(TransInfo *t, wmEvent *event)
 	
 	if (event->type == MIDDLEMOUSE && event->val == KM_PRESS) {
 		// Use customData pointer to signal warp direction
-		if	(t->customData == NULL)
-			t->customData = (void*)1;
+		if (t->customData == NULL)
+			t->customData = (void *)1;
 		else
 			t->customData = NULL;
 		
@@ -2451,7 +2451,7 @@ int handleEventShear(TransInfo *t, wmEvent *event)
 	
 	if (event->type == MIDDLEMOUSE && event->val == KM_PRESS) {
 		// Use customData pointer to signal Shear direction
-		if	(t->customData == NULL) {
+		if (t->customData == NULL) {
 			initMouseInputMode(t, &t->mouse, INPUT_VERTICAL_ABSOLUTE);
 			t->customData = (void*)1;
 		}
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index dad1c65298a..4d20346f79d 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -3757,42 +3757,42 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 
 		/* *** Extend Transform *** */
 
-		Scene * scene= t->scene;
+		Scene *scene = t->scene;
 		int cfra= CFRA;
 		int left= seq_tx_get_final_left(seq, 1);
 		int right= seq_tx_get_final_right(seq, 1);
 
 		if (seq->depth == 0 && ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK))) {
-			*recursive= 0;
-			*count= 0;
-			*flag= 0;
+			*recursive = FALSE;
+			*count = 0;
+			*flag = 0;
 		}
-		else if (seq->type ==SEQ_META) {
+		else if (seq->type == SEQ_META) {
 
 			/* for meta's we only ever need to extend their children, no matter what depth
 			 * just check the meta's are in the bounds */
-			if (t->frame_side=='R' && right <= cfra)		*recursive= 0;
-			else if (t->frame_side=='L' && left >= cfra)	*recursive= 0;
-			else											*recursive= 1;
+			if      (t->frame_side=='R' && right <= cfra)  *recursive = FALSE;
+			else if (t->frame_side=='L' && left  >= cfra)  *recursive = FALSE;
+			else                                           *recursive = TRUE;
 
 			*count= 1;
 			*flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
 		}
 		else {
 
-			*recursive= 0;	/* not a meta, so no thinking here */
-			*count= 1;		/* unless its set to 0, extend will never set 2 handles at once */
-			*flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+			*recursive = FALSE;  /* not a meta, so no thinking here */
+			*count = 1;          /* unless its set to 0, extend will never set 2 handles at once */
+			*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
 
 			if (t->frame_side=='R') {
-				if (right <= cfra)		*count= *flag= 0;	/* ignore */
-				else if (left > cfra)	;	/* keep the selection */
-				else					*flag |= SEQ_RIGHTSEL;
+				if      (right <= cfra) *count = *flag= 0;  /* ignore */
+				else if (left   > cfra) ;                  /* keep the selection */
+				else                    *flag |= SEQ_RIGHTSEL;
 			}
 			else {
-				if (left >= cfra)		*count= *flag= 0;	/* ignore */
-				else if (right < cfra)	;	/* keep the selection */
-				else					*flag |= SEQ_LEFTSEL;
+				if      (left >= cfra)  *count = *flag= 0;  /* ignore */
+				else if (right < cfra)  ;                  /* keep the selection */
+				else                    *flag |= SEQ_LEFTSEL;
 			}
 		}
 	}
@@ -3808,9 +3808,9 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 
 			/* Non nested strips (resect selection and handles) */
 			if ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK)) {
-				*recursive= 0;
-				*count= 0;
-				*flag= 0;
+				*recursive = FALSE;
+				*count = 0;
+				*flag = 0;
 			}
 			else {
 				if ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == (SEQ_LEFTSEL|SEQ_RIGHTSEL)) {
@@ -3826,10 +3826,10 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 
 				if ((seq->type == SEQ_META) && ((seq->flag & (SEQ_LEFTSEL|SEQ_RIGHTSEL)) == 0)) {
 					/* if any handles are selected, don't recurse */
-					*recursive = 1;
+					*recursive = TRUE;
 				}
 				else {
-					*recursive = 0;
+					*recursive = FALSE;
 				}
 			}
 		}
@@ -3837,9 +3837,9 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 			/* Nested, different rules apply */
 
 #ifdef SEQ_TX_NESTED_METAS
-			*flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
-			*count= 1; /* ignore the selection for nested */
-			*recursive = (seq->type == SEQ_META	);
+			*flag = (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
+			*count = 1; /* ignore the selection for nested */
+			*recursive = (seq->type == SEQ_META);
 #else
 			if (seq->type == SEQ_META) {
 				/* Meta's can only directly be moved between channels since they
@@ -3848,12 +3848,12 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
 				 * calc_sequence() will update its settings when run on the toplevel meta */
 				*flag= 0;
 				*count= 0;
-				*recursive = 1;
+				*recursive = TRUE;
 			}
 			else {
 				*flag= (seq->flag | SELECT) & ~(SEQ_LEFTSEL|SEQ_RIGHTSEL);
 				*count= 1; /* ignore the selection for nested */
-				*recursive = 0;
+				*recursive = FALSE;
 			}
 #endif
 		}
@@ -4131,9 +4131,9 @@ static void freeSeqData(TransInfo *t)
 			for (seq= seqbasep->first; seq; seq= seq->next) {
 				/* We might want to build a list of effects that need to be updated during transform */
 				if (seq->type & SEQ_EFFECT) {
-					if		(seq->seq1 && seq->seq1->flag & SELECT) calc_sequence(t->scene, seq);
-					else if	(seq->seq2 && seq->seq2->flag & SELECT) calc_sequence(t->scene, seq);
-					else if	(seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(t->scene, seq);
+					if      (seq->seq1 && seq->seq1->flag & SELECT) calc_sequence(t->scene, seq);
+					else if (seq->seq2 && seq->seq2->flag & SELECT) calc_sequence(t->scene, seq);
+					else if (seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(t->scene, seq);
 				}
 			}
 
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index a9179f95d4e..23c1fba6107 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1606,7 +1606,7 @@ void calculatePropRatio(TransInfo *t)
 				td->factor = 0.0f;
 				restoreElement(td);
 			}
-			else if	((connected && (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) ||
+			else if ((connected && (td->flag & TD_NOTCONNECTED || td->dist > t->prop_size)) ||
 			         (connected == 0 && td->rdist > t->prop_size))
 			{
 				/*
diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c
index b25c76fe193..5d5142740cb 100644
--- a/source/blender/editors/transform/transform_input.c
+++ b/source/blender/editors/transform/transform_input.c
@@ -87,8 +87,8 @@ static void InputSpringFlip(TransInfo *t, MouseInput *mi, const int mval[2], flo
 
 	/* flip scale */
 	/* values can become really big when zoomed in so use longs [#26598] */
-	if	((long long int)(mi->center[0] - mval[0]) * (long long int)(mi->center[0] - mi->imval[0]) +
-		 (long long int)(mi->center[1] - mval[1]) * (long long int)(mi->center[1] - mi->imval[1]) < 0)
+	if ((long long int)(mi->center[0] - mval[0]) * (long long int)(mi->center[0] - mi->imval[0]) +
+		(long long int)(mi->center[1] - mval[1]) * (long long int)(mi->center[1] - mi->imval[1]) < 0)
 	 {
 		output[0] *= -1.0f;
 	 }
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index b875886e80a..75d5efca21f 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -689,7 +689,7 @@ static float RotationBetween(TransInfo *t, float p1[3], float p2[3])
 		
 		if (dot_v3v3(tmp, axis) < 0.0f)
 			angle = -acos(dot_v3v3(start, end));
-		else	
+		else
 			angle = acos(dot_v3v3(start, end));
 	}
 	else {
diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c
index da207c19695..900bc7756f0 100644
--- a/source/blender/imbuf/intern/filetype.c
+++ b/source/blender/imbuf/intern/filetype.c
@@ -100,7 +100,7 @@ ImFileType IMB_FILE_TYPES[] = {
 #endif
 #ifdef WITH_QUICKTIME
 	{quicktime_init, quicktime_exit, imb_is_a_quicktime, imb_ftype_quicktime, imb_quicktime_decode, NULL, NULL, 0, QUICKTIME},
-#endif	
+#endif
 	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0}
 };
 	
diff --git a/source/blender/imbuf/intern/filter.c b/source/blender/imbuf/intern/filter.c
index e744851a9b6..30142e5f5d5 100644
--- a/source/blender/imbuf/intern/filter.c
+++ b/source/blender/imbuf/intern/filter.c
@@ -407,7 +407,7 @@ void IMB_filter_extend(struct ImBuf *ibuf, char *mask, int filter)
 								if (i != 0 || j != 0) {
 									const int tmpindex = filter_make_index(x + i, y + j, width, height);
 
-									if (check_pixel_assigned(srcbuf, srcmask, tmpindex, depth, is_float))   {
+									if (check_pixel_assigned(srcbuf, srcmask, tmpindex, depth, is_float)) {
 										if (is_float) {
 											for (c = 0; c < depth; c++)
 												tmp[c] = ((const float *) srcbuf)[depth * tmpindex + c];
diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c
index 0c6a5b56a3e..2178b6a4155 100644
--- a/source/blender/imbuf/intern/tiff.c
+++ b/source/blender/imbuf/intern/tiff.c
@@ -478,7 +478,7 @@ static int imb_read_tiff_pixels(ImBuf *ibuf, TIFF *image, int premul)
 		/* assign rect last */
 		if (tmpibuf->rect_float)
 			ibuf->rect_float = tmpibuf->rect_float;
-		else	
+		else
 			ibuf->rect = tmpibuf->rect;
 		ibuf->mall |= ib_flag;
 		ibuf->flags |= ib_flag;
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 4c16239f137..1f5ac24db92 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3640,7 +3640,7 @@ static void rna_def_node_socket_subtype(BlenderRNA *brna, int type, int subtype,
 	PropertyRNA *prop = NULL;
 	PropertySubType propsubtype = PROP_NONE;
 	
-	#define SUBTYPE(socktype, stypename, id, idname)	{ PROP_##id, #socktype "_" #id, 0, #idname, ""},
+	#define SUBTYPE(socktype, stypename, id, idname) { PROP_##id, #socktype "_" #id, 0, #idname, ""},
 	static EnumPropertyItem subtype_items[] = {
 		NODE_DEFINE_SUBTYPES
 		{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index a3169bdba46..609d70b6e98 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -71,7 +71,7 @@ static void freeData(ModifierData *md)
 {
 	CollisionModifierData *collmd = (CollisionModifierData *) md;
 	
-	if (collmd)  {
+	if (collmd) {
 		if (collmd->bvhtree)
 			BLI_bvhtree_free(collmd->bvhtree);
 		if (collmd->x)
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c
index 5206aa281f7..0a14b4d5a08 100644
--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@@ -273,7 +273,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	/* loop over edges and faces, and do the same thing to 
 	 * ensure that they only reference existing verts 
 	 */
-	for (i = 0; i < maxEdges; i++)  {
+	for (i = 0; i < maxEdges; i++) {
 		MEdge me;
 		dm->getEdge(dm, i, &me);
 		
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index f45cc9c2ade..ce95f9bec6e 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -94,7 +94,7 @@ static void screwvert_iter_step(ScrewVertIter *iter)
 		iter->v_other = iter->v;
 		iter->v = iter->v_poin->v[0];
 	}
-	if (iter->v >= 0)   {
+	if (iter->v >= 0) {
 		iter->v_poin = &iter->v_array[iter->v];
 		iter->e = iter->v_poin->e[(iter->v_poin->e[0] == iter->e)];
 	}
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.c b/source/blender/nodes/composite/nodes/node_composite_blur.c
index 77b62938d94..d19ea3f202f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.c
@@ -699,7 +699,7 @@ static void node_composit_exec_blur(void *data, bNode *node, bNodeStack **in, bN
 					bokeh_single_image(node, new, gammabuf, in[1]->vec[0]);
 				else if (1)
 					blur_single_image(node, new, gammabuf, in[1]->vec[0]);
-				else	/* bloom experimental... */
+				else  /* bloom experimental... */
 					bloom_with_reference(new, gammabuf, NULL, in[1]->vec[0], nbd);
 				
 				if (nbd->gamma) {
diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.c b/source/blender/nodes/composite/nodes/node_composite_defocus.c
index 84b203d005a..4c1c4e28c8d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_defocus.c
+++ b/source/blender/nodes/composite/nodes/node_composite_defocus.c
@@ -748,7 +748,7 @@ static void defocus_blur(bNode *node, CompBuf *new, CompBuf *img, CompBuf *zbuf,
 					p4 = p * new->type;
 					if (nqd->bktype==0)	// Disk
 						lwt = ((u*u + v*v)<=cR2) ? wcor : 0.f;
-					else	// AA not needed here
+					else  /* AA not needed here */
 						lwt = wcor * getWeight(BKH, len_bkh, u, v, ct_crad, inradsq);
 					// prevent background bleeding onto in-focus pixels, user-option
 					if (ct_crad > nqd->bthresh) {  // if center blur > threshold
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index a1cc1e23470..eb628b87b3d 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -559,7 +559,7 @@ static void GetTextureCoordinate(const SMikkTSpaceContext * pContext, float fUV[
 	MTFace *tface= RE_vlakren_get_tface(pMesh->obr, vlr, pMesh->obr->actmtface, NULL, 0);
 	const float *coord;
 	
-	if (tface != NULL)	{
+	if (tface != NULL) {
 		coord= tface->uv[vert_index];
 		fUV[0]= coord[0]; fUV[1]= coord[1];
 	}
@@ -585,7 +585,7 @@ static void SetTSpace(const SMikkTSpaceContext * pContext, const float fvTangent
 	SRenderMeshToTangent * pMesh = (SRenderMeshToTangent *) pContext->m_pUserData;
 	VlakRen *vlr= RE_findOrAddVlak(pMesh->obr, face_num);
 	float * ftang= RE_vlakren_get_nmap_tangent(pMesh->obr, vlr, 1);
-	if (ftang!=NULL)	{
+	if (ftang!=NULL) {
 		copy_v3_v3(&ftang[iVert*4+0], fvTangent);
 		ftang[iVert*4+3]=fSign;
 	}
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index bf18c04cd73..f1a5326c602 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -2425,7 +2425,7 @@ void do_material_tex(ShadeInput *shi, Render *re)
 						}
 					}
 				}
-#endif				
+#endif
 			}
 
 			/* mapping */
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index a0f5caa826b..a266914c085 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -1807,7 +1807,7 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
 				shr->diff[1]= sss[1]*col[1];
 				shr->diff[2]= sss[2]*col[2];
 
-				if (shi->combinedflag & SCE_PASS_SHADOW)	{
+				if (shi->combinedflag & SCE_PASS_SHADOW) {
 					shr->shad[0]= shr->diff[0];
 					shr->shad[1]= shr->diff[1];
 					shr->shad[2]= shr->diff[2];
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c
index c20a281fa96..14a25cc13e0 100644
--- a/source/blender/windowmanager/intern/wm_gesture.c
+++ b/source/blender/windowmanager/intern/wm_gesture.c
@@ -154,7 +154,7 @@ int wm_gesture_evaluate(wmGesture *gesture)
 			if (val == 6) printf("tweak south-west\n");
 			if (val == 7) printf("tweak west\n");
 			if (val == 8) printf("tweak north-west\n");
-#endif			
+#endif
 			return val;
 		}
 	}
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 977cfbaa8d7..1f0756b2c24 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -1208,7 +1208,7 @@ int main(int argc, const char **argv)
 		argv[argci] = alloc_utf_8_from_16(argv_16[argci], 0);
 	}
 	LocalFree(argv_16);
-#endif	
+#endif
 
 #ifdef WITH_PYTHON_MODULE
 #ifdef __APPLE__