style cleanyp

4 files changed, 31 insertions, 31 deletions

diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c
index a265505cc8f..19985c56b84 100644
--- a/source/blender/blenlib/intern/BLI_kdtree.c
+++ b/source/blender/blenlib/intern/BLI_kdtree.c
@@ -399,7 +399,7 @@ int BLI_kdtree_range_search(KDTree *tree, float range, const float co[3], const
 	}
 	else {
 		dist2 = squared_distance(root->co, co, root->nor, nor);
-		if (dist2  <= range2)
+		if (dist2 <= range2)
 			add_in_range(&foundstack, found++, &totfoundstack, root->index, dist2, root->co);
 
 		if (root->left)
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c
index feaa60b40b2..5da719cd500 100644
--- a/source/blender/blenlib/intern/boxpack2d.c
+++ b/source/blender/blenlib/intern/boxpack2d.c
@@ -63,35 +63,35 @@ typedef struct BoxVert {
 #define TL 2
 #define BR 3
 
-#define BOXLEFT(b)		((b)->v[BL]->x)
-#define BOXRIGHT(b)		((b)->v[TR]->x)
-#define BOXBOTTOM(b)	((b)->v[BL]->y)
-#define BOXTOP(b)		((b)->v[TR]->y)
-#define BOXAREA(b)		((b)->w * (b)->h)
-
-#define UPDATE_V34X(b)	((b)->v[TL]->x = (b)->v[BL]->x); \
-						((b)->v[BR]->x = (b)->v[TR]->x)
-#define UPDATE_V34Y(b)	((b)->v[TL]->y = (b)->v[TR]->y); \
-						((b)->v[BR]->y = (b)->v[BL]->y)
+#define BOXLEFT(b)      ((b)->v[BL]->x)
+#define BOXRIGHT(b)     ((b)->v[TR]->x)
+#define BOXBOTTOM(b)    ((b)->v[BL]->y)
+#define BOXTOP(b)       ((b)->v[TR]->y)
+#define BOXAREA(b)      ((b)->w * (b)->h)
+
+#define UPDATE_V34X(b)  ((b)->v[TL]->x = (b)->v[BL]->x); \
+                        ((b)->v[BR]->x = (b)->v[TR]->x)
+#define UPDATE_V34Y(b)  ((b)->v[TL]->y = (b)->v[TR]->y); \
+                        ((b)->v[BR]->y = (b)->v[BL]->y)
 #define UPDATE_V34(b) UPDATE_V34X(b); UPDATE_V34Y(b)
 
-#define SET_BOXLEFT(b, f)	(b)->v[TR]->x = f + (b)->w; \
-							(b)->v[BL]->x = f;          \
-							UPDATE_V34X(b)
-#define SET_BOXRIGHT(b, f)	(b)->v[BL]->x = f - (b)->w; \
-							(b)->v[TR]->x = f;          \
-							UPDATE_V34X(b)
-#define SET_BOXBOTTOM(b, f)	(b)->v[TR]->y = f + (b)->h; \
-							(b)->v[BL]->y = f;          \
-							UPDATE_V34Y(b)
-#define SET_BOXTOP(b, f)	(b)->v[BL]->y = f - (b)->h; \
-							(b)->v[TR]->y = f;          \
-							UPDATE_V34Y(b)
+#define SET_BOXLEFT(b, f)   (b)->v[TR]->x = f + (b)->w; \
+                            (b)->v[BL]->x = f;          \
+                            UPDATE_V34X(b)
+#define SET_BOXRIGHT(b, f)  (b)->v[BL]->x = f - (b)->w; \
+                            (b)->v[TR]->x = f;          \
+                            UPDATE_V34X(b)
+#define SET_BOXBOTTOM(b, f) (b)->v[TR]->y = f + (b)->h; \
+                            (b)->v[BL]->y = f;          \
+                            UPDATE_V34Y(b)
+#define SET_BOXTOP(b, f)    (b)->v[BL]->y = f - (b)->h; \
+                            (b)->v[TR]->y = f;          \
+                            UPDATE_V34Y(b)
 #define BOXINTERSECT(b1, b2)                 \
-	!(BOXLEFT(b1)   + EPSILON >= BOXRIGHT(b2) || \
-	  BOXBOTTOM(b1) + EPSILON >= BOXTOP(b2)   || \
-	  BOXRIGHT(b1)  - EPSILON <= BOXLEFT(b2)  || \
-	  BOXTOP(b1)    - EPSILON <= BOXBOTTOM(b2))
+    !(BOXLEFT(b1)   + EPSILON >= BOXRIGHT(b2) || \
+      BOXBOTTOM(b1) + EPSILON >= BOXTOP(b2)   || \
+      BOXRIGHT(b1)  - EPSILON <= BOXLEFT(b2)  || \
+      BOXTOP(b1)    - EPSILON <= BOXBOTTOM(b2))
 
 #define MIN2(x, y)              ((x) < (y) ? (x) : (y))
 #define MAX2(x, y)              ((x) > (y) ? (x) : (y))
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index ef2eb25a891..a0e72af8131 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -136,7 +136,7 @@ static void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vf
 					onpoints[j]++;
 
 				if (k < npoints[j] - 1) {
-					if (ftoutline.tags[l]   == FT_Curve_Tag_Conic &&
+					if (ftoutline.tags[l] == FT_Curve_Tag_Conic &&
 					    ftoutline.tags[l + 1] == FT_Curve_Tag_Conic)
 					{
 						onpoints[j]++;
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c
index 10eb4e82912..3a8705bbbba 100644
--- a/source/blender/blenlib/intern/voxel.c
+++ b/source/blender/blenlib/intern/voxel.c
@@ -93,9 +93,9 @@ float BLI_voxel_sample_trilinear(float *data, const int res[3], const float co[3
 		const float w[2] = {1.f - dz, dz};
 	
 		return w[0] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[0]] + u[1] * data[xc[1] + yc[0] + zc[0]] )
-						+ v[1] * ( u[0] * data[xc[0] + yc[1] + zc[0]] + u[1] * data[xc[1] + yc[1] + zc[0]] ) )
-			 + w[1] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[1]] + u[1] * data[xc[1] + yc[0] + zc[1]] )
-						+ v[1] * ( u[0] * data[xc[0] + yc[1] + zc[1]] + u[1] * data[xc[1] + yc[1] + zc[1]] ) );
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[0]] + u[1] * data[xc[1] + yc[1] + zc[0]] ) )
+		     + w[1] * (   v[0] * ( u[0] * data[xc[0] + yc[0] + zc[1]] + u[1] * data[xc[1] + yc[0] + zc[1]] )
+		                + v[1] * ( u[0] * data[xc[0] + yc[1] + zc[1]] + u[1] * data[xc[1] + yc[1] + zc[1]] ) );
 	
 	}
 	return 0.f;