Style Cleanup: whitespace

7 files changed, 15 insertions, 16 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__ */