Style Cleanup: whitespace

31 files changed, 64 insertions, 66 deletions

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 8796bd54bd3..ee7d89071d3 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1571,7 +1571,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 			continue;
 		}
 		if (sculpt_mode &&
-			(!has_multires || multires_applied || ob->sculpt->bm))
+		    (!has_multires || multires_applied || ob->sculpt->bm))
 		{
 			int unsupported = 0;
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 32914dedde1..712f79c40a7 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -429,7 +429,7 @@ static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges
 	int i;
 
 	if (cddm->pbvh && cddm->pbvh_draw &&
-		BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH)
+	    BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH)
 	{
 		BKE_pbvh_draw(cddm->pbvh, NULL, NULL, NULL, TRUE);
 
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index ce42d6abc33..546c3f9e94b 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -350,8 +350,8 @@ static int layer_bucket_isect_test(MaskRasterLayer *layer, unsigned int face_ind
 		}
 		else {
 			if ((dist_squared_to_line_segment_v2(cent, v1, v2) < bucket_max_rad_squared) ||
-				(dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
-				(dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared))
+			    (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
+			    (dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared))
 			{
 				return TRUE;
 			}
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 694c835d62f..b2738f5c7f0 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1997,7 +1997,7 @@ int BKE_mesh_mselect_find(Mesh *me, int index, int type)
 
 	for (i = 0; i < me->totselect; i++) {
 		if ((me->mselect[i].index == index) &&
-			(me->mselect[i].type == type))
+		    (me->mselect[i].type == type))
 		{
 			return i;
 		}
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index bfde9a9d774..3596ad981f6 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -605,7 +605,7 @@ static void long_edge_queue_create(EdgeQueueContext *eq_ctx,
 
 		/* Check leaf nodes marked for topology update */
 		if ((node->flag & PBVH_Leaf) &&
-			(node->flag & PBVH_UpdateTopology))
+		    (node->flag & PBVH_UpdateTopology))
 		{
 			GHashIterator gh_iter;
 
@@ -644,7 +644,7 @@ static void short_edge_queue_create(EdgeQueueContext *eq_ctx,
 
 		/* Check leaf nodes marked for topology update */
 		if ((node->flag & PBVH_Leaf) &&
-			(node->flag & PBVH_UpdateTopology))
+		    (node->flag & PBVH_UpdateTopology))
 		{
 			GHashIterator gh_iter;
 
@@ -747,7 +747,7 @@ static void pbvh_bmesh_split_edge(EdgeQueueContext *eq_ctx, PBVH *bvh,
 
 		/* Ensure new vertex is in the node */
 		if (!BLI_gset_haskey(bvh->nodes[ni].bm_unique_verts, v_new) &&
-			!BLI_gset_haskey(bvh->nodes[ni].bm_other_verts, v_new))
+		    !BLI_gset_haskey(bvh->nodes[ni].bm_other_verts, v_new))
 		{
 			BLI_gset_insert(bvh->nodes[ni].bm_other_verts, v_new);
 		}
@@ -788,7 +788,7 @@ static int pbvh_bmesh_subdivide_long_edges(EdgeQueueContext *eq_ctx, PBVH *bvh,
 		 * and the node has been split, thus leaving wire edges and
 		 * associated vertices. */
 		if (!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v1) ||
-			!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
+		    !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
 		{
 			continue;
 		}
@@ -974,7 +974,7 @@ static int pbvh_bmesh_collapse_short_edges(EdgeQueueContext *eq_ctx,
 		 * and the node has been split, thus leaving wire edges and
 		 * associated vertices. */
 		if (!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v1) ||
-			!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
+		    !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
 		{
 			continue;
 		}
@@ -1145,7 +1145,7 @@ int BKE_pbvh_bmesh_update_topology(PBVH *bvh, PBVHTopologyUpdateMode mode,
 		PBVHNode *node = &bvh->nodes[n];
 
 		if (node->flag & PBVH_Leaf &&
-			node->flag & PBVH_UpdateTopology)
+		    node->flag & PBVH_UpdateTopology)
 		{
 			node->flag &= ~PBVH_UpdateTopology;
 		}
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 188c80e7cc8..2d23c32720b 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -142,8 +142,7 @@ static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels,
 		ccgSubSurf_getUseAgeCounts(prevSS, &oldUseAging, NULL, NULL, NULL);
 
 		if ((oldUseAging != useAging) ||
-			(ccgSubSurf_getSimpleSubdiv(prevSS) !=
-			 !!(flags & CCG_SIMPLE_SUBDIV)))
+		    (ccgSubSurf_getSimpleSubdiv(prevSS) != !!(flags & CCG_SIMPLE_SUBDIV)))
 		{
 			ccgSubSurf_free(prevSS);
 		}
diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h
index 9d6c901c678..3245fe5fbd5 100644
--- a/source/blender/blenkernel/tracking_private.h
+++ b/source/blender/blenkernel/tracking_private.h
@@ -32,8 +32,8 @@
  * by multiple tracking files but which should not be public.
  */
 
-#ifndef __TRACKING_PRIVATE__
-#define __TRACKING_PRIVATE__
+#ifndef __TRACKING_PRIVATE_H__
+#define __TRACKING_PRIVATE_H__
 
 struct GHash;
 struct MovieTracking;
@@ -81,4 +81,4 @@ void tracking_set_marker_coords_from_tracking(int frame_width, int frame_height,
 void tracking_marker_insert_disabled(struct MovieTrackingTrack *track, const struct MovieTrackingMarker *ref_marker,
                                      bool before, bool overwrite);
 
-#endif  /* __TRACKING_PRIVATE__ */
+#endif  /* __TRACKING_PRIVATE_H__ */
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index e565d6e001c..e7beaaa33a0 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -115,7 +115,7 @@ int BLI_utf8_invalid_byte(const char *str, int length)
 			 * and then for 1111 1100, xx00 00xx */
 		case 5:
 			if (c == 0xfe || c == 0xff ||
-				(c == 0xfc && (*p & 0x3c) == 0)) goto utf8_error;
+			    (c == 0xfc && (*p & 0x3c) == 0)) goto utf8_error;
 			break;
 		}
 
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 0a6c0f4b293..2f05d901d27 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -167,8 +167,8 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
 			{
 				BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
 					if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
-						BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
-						!BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+					    BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+					    !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
 					{
 						BM_elem_flag_enable(e, BM_ELEM_SELECT);
 					}
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index aca2f96dc18..4cf252e76e8 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -641,12 +641,12 @@ static void *bmw_LoopWalker_step(BMWalker *walker)
 
 		/* check if we should step, this is fairly involved */
 		if (
-			/* walk over boundary of faces but stop at corners */
-			(owalk.is_single == false && vert_edge_tot > 2) ||
+		    /* walk over boundary of faces but stop at corners */
+		    (owalk.is_single == false && vert_edge_tot > 2) ||
 
-			/* initial edge was a boundary, so is this edge and vertex is only apart of this face
-			 * this lets us walk over the the boundary of an ngon which is handy */
-			(owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
+		    /* initial edge was a boundary, so is this edge and vertex is only apart of this face
+		    * this lets us walk over the the boundary of an ngon which is handy */
+		    (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
 		{
 			/* find next boundary edge in the fan */
 			do {
@@ -932,7 +932,7 @@ static void *bmw_EdgeringWalker_step(BMWalker *walker)
 	}
 
 	if ((len <= 0) || (len % 2 != 0) || !EDGE_CHECK(l->e) ||
-		!bmw_mask_check_face(walker, l->f))
+	    !bmw_mask_check_face(walker, l->f))
 	{
 		l = owalk.l;
 		i = len;
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 0024e17f974..71bb5834351 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -2436,7 +2436,7 @@ static bool tri_corner_test(BevelParams *bp, BevVert *bv)
 		totang += ang;
 	}
 	angdiff = fabsf(totang - 3.0f * (float)M_PI_2);
-	if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI/16.0f) ||
+	if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI / 16.0f) ||
 	    (angdiff > (float)M_PI_4))
 	{
 		return false;
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 7001cfa4061..7a33dc40f8e 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -248,7 +248,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
 						/* would be nice to avoid loop lookup here,
 						 * but we need to know which face the verts are in */
 						if ((l_a = BM_face_vert_share_loop(face_split_arr[j], v_a)) &&
-							(l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
+						    (l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
 						{
 							found = true;
 							break;
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c
index 14d474fed61..3b70d0e6406 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.c
+++ b/source/blender/bmesh/tools/bmesh_edgenet.c
@@ -221,7 +221,7 @@ static BMEdge *bm_edgenet_path_step(
 
 					if (vn_curr->pass == -vn_next->pass) {
 						if ((vn_curr->flag & VNINFO_FLAG_IS_MIXFACE) ||
-							(vn_next->flag & VNINFO_FLAG_IS_MIXFACE))
+						    (vn_next->flag & VNINFO_FLAG_IS_MIXFACE))
 						{
 							/* found connecting edge */
 							if (bm_edgenet_path_check_overlap(v_curr, v_next, vnet_info) == false) {
@@ -237,8 +237,8 @@ static BMEdge *bm_edgenet_path_step(
 						/* flush flag down the path */
 						vn_next->flag &= ~VNINFO_FLAG_IS_MIXFACE;
 						if ((vn_curr->flag & VNINFO_FLAG_IS_MIXFACE) ||
-							(vn_next->face == -1) ||
-							(vn_next->face != vn_curr->face))
+						    (vn_next->face == -1) ||
+						    (vn_next->face != vn_curr->face))
 						{
 							vn_next->flag |= VNINFO_FLAG_IS_MIXFACE;
 						}
diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.c b/source/blender/bmesh/tools/bmesh_edgesplit.c
index 412253aafe9..947b77675d8 100644
--- a/source/blender/bmesh/tools/bmesh_edgesplit.c
+++ b/source/blender/bmesh/tools/bmesh_edgesplit.c
@@ -88,7 +88,7 @@ static void bm_edgesplit_validate_seams(BMesh *bm)
 	BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
 		if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
 			if (vtouch[BM_elem_index_get(e->v1)] == 1 &&
-				vtouch[BM_elem_index_get(e->v2)] == 1)
+			    vtouch[BM_elem_index_get(e->v2)] == 1)
 			{
 				BM_elem_flag_disable(e, BM_ELEM_TAG);
 			}
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index b82142a33e6..17d26f4d96c 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -6085,8 +6085,8 @@ static int curve_delete_segments(Object *obedit, const bool split)
 						bezt2 = &nu->bezt[nu->pntsu - 2];
 
 						if ((nu->flagu & CU_NURB_CYCLIC) &&
-							BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
-							BEZSELECTED_HIDDENHANDLES(cu, bezt2))
+						    BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
+						    BEZSELECTED_HIDDENHANDLES(cu, bezt2))
 						{
 							/* check if need to join start of spline to end */
 							nu1 = BKE_nurb_copy(nu, cut + 1, 1);
@@ -6107,8 +6107,8 @@ static int curve_delete_segments(Object *obedit, const bool split)
 						bezt2 = &nu->bezt[1];
 
 						if ((nu->flagu & CU_NURB_CYCLIC) &&
-							BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
-							BEZSELECTED_HIDDENHANDLES(cu, bezt2))
+						    BEZSELECTED_HIDDENHANDLES(cu, bezt1) &&
+						    BEZSELECTED_HIDDENHANDLES(cu, bezt2))
 						{
 							/* check if need to join start of spline to end */
 							nu1 = BKE_nurb_copy(nu, cut + 1, 1);
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index f235ef412ba..09cfcf5256f 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -1195,14 +1195,14 @@ static void gp_stroke_to_bezier(bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Cu
 			interp_v3_v3v3(h2, p1, p2, BEZT_HANDLE_FAC);
 			bezt++;
 			gp_stroke_to_bezier_add_point(gtd, bezt, p1, h1, h2, (bezt - 1)->vec[1], do_gtd, gps->prev->inittime, dt1,
-                                          0.0f, rad_fac, minmax_weights);
+			                              0.0f, rad_fac, minmax_weights);
 
 			/* Second point */
 			interp_v3_v3v3(h1, p2, p1, BEZT_HANDLE_FAC);
 			interp_v3_v3v3(h2, p2, p3d_cur, BEZT_HANDLE_FAC);
 			bezt++;
 			gp_stroke_to_bezier_add_point(gtd, bezt, p2, h1, h2, p1, do_gtd, gps->inittime, dt2,
-                                          0.0f, rad_fac, minmax_weights);
+			                              0.0f, rad_fac, minmax_weights);
 
 			old_nbezt += 2;
 			copy_v3_v3(p3d_prev, p2);
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 79ae8536acc..ae456669257 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6964,7 +6964,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar)
 
 					for (i = 0; i < len; i++) {
 						if (!dyn_data->items_filter_flags ||
-							((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
+						    ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
 						{
 							org_order[new_order ? new_order[++org_idx] : ++org_idx] = i;
 							if (i == value) {
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 92a621387a8..c7de757e2c9 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2842,7 +2842,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
 			RNA_PROP_BEGIN (dataptr, itemptr, prop)
 			{
 				if (!dyn_data->items_filter_flags ||
-					((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
+				    ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude))
 				{
 					int ii;
 					if (dyn_data->items_filter_neworder) {
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index e59106c265a..f74e7dc0a1d 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -1656,8 +1656,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 		 *		and only the time-grids with their zoomability can do so)
 		 */
 		if ((v2d->keepzoom & V2D_LOCKZOOM_X) == 0 &&
-			(v2d->scroll & V2D_SCROLL_SCALE_HORIZONTAL) &&
-			(BLI_rcti_size_x(&slider) > V2D_SCROLLER_HANDLE_SIZE))
+		    (v2d->scroll & V2D_SCROLL_SCALE_HORIZONTAL) &&
+		    (BLI_rcti_size_x(&slider) > V2D_SCROLLER_HANDLE_SIZE))
 		{
 			state |= UI_SCROLL_ARROWS;
 		}
@@ -1768,8 +1768,8 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v
 		 *		and only the time-grids with their zoomability can do so)
 		 */
 		if ((v2d->keepzoom & V2D_LOCKZOOM_Y) == 0 &&
-			(v2d->scroll & V2D_SCROLL_SCALE_VERTICAL) &&
-			(BLI_rcti_size_y(&slider) > V2D_SCROLLER_HANDLE_SIZE))
+		    (v2d->scroll & V2D_SCROLL_SCALE_VERTICAL) &&
+		    (BLI_rcti_size_y(&slider) > V2D_SCROLLER_HANDLE_SIZE))
 		{
 			state |= UI_SCROLL_ARROWS;
 		}
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 6decec75de4..83947534d06 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -756,7 +756,7 @@ static int mesh_customdata_clear_mask_exec(bContext *C, wmOperator *UNUSED(op))
 	int ret_b = mesh_customdata_clear_exec__internal(C, BM_LOOP, CD_GRID_PAINT_MASK);
 
 	if (ret_a == OPERATOR_FINISHED ||
-		ret_b == OPERATOR_FINISHED)
+	    ret_b == OPERATOR_FINISHED)
 	{
 		return OPERATOR_FINISHED;
 	}
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index d4fac49e973..e9e7dd282a6 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -927,8 +927,8 @@ static int followpath_path_animate_exec(bContext *C, wmOperator *op)
 	if (data->tar) {
 		Curve *cu = (Curve *)data->tar->data;
 		
-		if ( ELEM(NULL, cu->adt, cu->adt->action) ||
-			(list_find_fcurve(&cu->adt->action->curves, "eval_time", 0) == NULL))
+		if (ELEM(NULL, cu->adt, cu->adt->action) ||
+		    (list_find_fcurve(&cu->adt->action->curves, "eval_time", 0) == NULL))
 		{
 			/* create F-Curve for path animation */
 			act = verify_adt_action(&cu->id, 1);
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 3f507cd5020..f0507abaf95 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -614,7 +614,7 @@ void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, r
 		 * or if the job is running and the size of preview changed */
 		if ((sbuts->spacetype == SPACE_BUTS && sbuts->preview) ||
 		    (!ok && !WM_jobs_test(wm, sa, WM_JOB_TYPE_RENDER_PREVIEW)) ||
-			(sp && (ABS(sp->sizex - newx) >= 2 || ABS(sp->sizey - newy) > 2)))
+		    (sp && (ABS(sp->sizex - newx) >= 2 || ABS(sp->sizey - newy) > 2)))
 		{
 			sbuts->preview = 0;
 			ED_preview_shader_job(C, sa, id, parent, slot, newx, newy, PR_BUTS_RENDER);
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 78af1bea8bc..00ae9f7a1c0 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -545,7 +545,7 @@ static void paint_draw_tex_overlay(UnifiedPaintSettings *ups, Brush *brush,
 
 	if (!(mtex->tex) || !((mtex->brush_map_mode == MTEX_MAP_MODE_STENCIL) ||
 	    (valid &&
-		ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))))
+	    ELEM(mtex->brush_map_mode, MTEX_MAP_MODE_VIEW, MTEX_MAP_MODE_TILED))))
 	{
 		return;
 	}
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 24093a4aa57..8c3024ee072 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3110,7 +3110,7 @@ static void sculpt_topology_update(Sculpt *sd, Object *ob, Brush *brush)
 			mode |= PBVH_Subdivide;
 
 		if ((sd->flags & SCULPT_DYNTOPO_COLLAPSE) ||
-			(brush->sculpt_tool == SCULPT_TOOL_SIMPLIFY))
+		    (brush->sculpt_tool == SCULPT_TOOL_SIMPLIFY))
 		{
 			mode |= PBVH_Collapse;
 		}
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 64326bd7993..de0665e13b1 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -598,7 +598,7 @@ static bool do_lasso_select_node(bContext *C, const int mcords[][2], short moves
 		                         &screen_co[0], &screen_co[1]);
 
 		if (BLI_rcti_isect_pt(&rect, screen_co[0], screen_co[1]) &&
-			BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], INT_MAX))
+		    BLI_lasso_is_point_inside(mcords, moves, screen_co[0], screen_co[1], INT_MAX))
 		{
 			nodeSetSelected(node, select);
 			changed = true;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 825a8c973a2..2fa28b34d13 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1891,7 +1891,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 		/* skip saving proportional edit if it was not actually used */
 		if (!(t->options & CTX_NO_PET)) {
 			if ((prop = RNA_struct_find_property(op->ptr, "proportional")) &&
-				!RNA_property_is_set(op->ptr, prop))
+			    !RNA_property_is_set(op->ptr, prop))
 			{
 				if (t->obedit)
 					ts->proportional = proportional;
@@ -1902,13 +1902,13 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
 			}
 
 			if ((prop = RNA_struct_find_property(op->ptr, "proportional_size")) &&
-				!RNA_property_is_set(op->ptr, prop))
+			    !RNA_property_is_set(op->ptr, prop))
 			{
 				ts->proportional_size = t->prop_size;
 			}
 
 			if ((prop = RNA_struct_find_property(op->ptr, "proportional_edit_falloff")) &&
-				!RNA_property_is_set(op->ptr, prop))
+			    !RNA_property_is_set(op->ptr, prop))
 			{
 				ts->prop_mode = t->prop_mode;
 			}
@@ -5323,7 +5323,7 @@ static bool createEdgeSlideVerts(TransInfo *t)
 
 	if ((t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) &&
 	    /* don't do this at all for non-basis shape keys, too easy to
-		 * accidentally break uv maps or vertex colors then */
+	     * accidentally break uv maps or vertex colors then */
 	    (bm->shapenr <= 1))
 	{
 		sld->use_origfaces = true;
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index e285fd8bea4..6d3d33f1897 100644
--- a/source/blender/editors/util/undo.c
+++ b/source/blender/editors/util/undo.c
@@ -358,14 +358,14 @@ int ED_undo_operator_repeat(bContext *C, struct wmOperator *op)
 		if (ar1)
 			CTX_wm_region_set(C, ar1);
 
-		if ( (WM_operator_repeat_check(C, op)) &&
-		     (WM_operator_poll(C, op->type)) &&
+		if ((WM_operator_repeat_check(C, op)) &&
+		    (WM_operator_poll(C, op->type)) &&
 		     /* note, undo/redo cant run if there are jobs active,
 		      * check for screen jobs only so jobs like material/texture/world preview
 		      * (which copy their data), wont stop redo, see [#29579]],
 		      *
 		      * note, - WM_operator_check_ui_enabled() jobs test _must_ stay in sync with this */
-		     (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY) == 0))
+		    (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY) == 0))
 		{
 			int retval;
 
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c
index e839c2fce90..ff7d37893c7 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -256,8 +256,8 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf
 
 		dpx->element[i].bitsPerSample = header.imageHeader.element[i].bits_per_sample;
 		if (dpx->element[i].bitsPerSample != 1 && dpx->element[i].bitsPerSample != 8 &&
-			dpx->element[i].bitsPerSample != 10 && dpx->element[i].bitsPerSample != 12 &&
-			dpx->element[i].bitsPerSample != 16)
+		    dpx->element[i].bitsPerSample != 10 && dpx->element[i].bitsPerSample != 12 &&
+		    dpx->element[i].bitsPerSample != 16)
 		{
 			if (verbose) printf("DPX: Unsupported bitsPerSample for elements %d: %d\n", i, dpx->element[i].bitsPerSample);
 			logImageClose(dpx);
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 75024951902..4aab1656f19 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -242,8 +242,8 @@ static void rna_trackingPlaneMarker_frame_set(PointerRNA *ptr, int value)
 		ListBase *tracksbase = BKE_tracking_object_get_plane_tracks(tracking, tracking_object);
 
 		for (plane_track = tracksbase->first;
-			 plane_track;
-			 plane_track = plane_track->next)
+		     plane_track;
+		     plane_track = plane_track->next)
 		{
 			if (plane_marker >= plane_track->markers && plane_marker < plane_track->markers + plane_track->markersnr) {
 				found = true;
@@ -479,8 +479,8 @@ static void rna_trackingMarker_frame_set(PointerRNA *ptr, int value)
 		ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
 
 		for (track = tracksbase->first;
-			 track;
-			 track = track->next)
+		     track;
+		     track = track->next)
 		{
 			if (marker >= track->markers && marker < track->markers + track->markersnr) {
 				found = true;
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index a493db139a0..b8f590c0e96 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -300,7 +300,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 			/* get particle state */
 			if ((psys->flag & (PSYS_HAIR_DONE | PSYS_KEYED) || psys->pointcache->flag & PTCACHE_BAKED) &&
-				(pimd->flag & eParticleInstanceFlag_Path))
+			    (pimd->flag & eParticleInstanceFlag_Path))
 			{
 				float ran = 0.0f;
 				if (pimd->random_position != 0.0f) {
diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c
index 5b3eabe5ca4..eef2e147736 100644
--- a/source/blender/python/bmesh/bmesh_py_ops_call.c
+++ b/source/blender/python/bmesh/bmesh_py_ops_call.c
@@ -690,8 +690,7 @@ PyObject *BPy_BMO_call(BPy_BMeshOpFunc *self, PyObject *args, PyObject *kw)
 
 	if ((PyTuple_GET_SIZE(args) == 1) &&
 	    (py_bm = (BPy_BMesh *)PyTuple_GET_ITEM(args, 0)) &&
-	    (BPy_BMesh_Check(py_bm))
-		)
+	    (BPy_BMesh_Check(py_bm)))
 	{
 		BPY_BM_CHECK_OBJ(py_bm);
 		bm = py_bm->bm;