style cleanup: brace placement/newlines

3 files changed, 41 insertions, 33 deletions

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 9497a81d386..fa47600deb2 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4444,7 +4444,8 @@ static void psys_prepare_physics(ParticleSimulationData *sim)
 static int hair_needs_recalc(ParticleSystem *psys)
 {
 	if (!(psys->flag & PSYS_EDITED) && (!psys->edit || !psys->edit->edited) &&
-		((psys->flag & PSYS_HAIR_DONE)==0 || psys->recalc & PSYS_RECALC_RESET || (psys->part->flag & PART_HAIR_REGROW && !psys->edit))) {
+	    ((psys->flag & PSYS_HAIR_DONE)==0 || psys->recalc & PSYS_RECALC_RESET || (psys->part->flag & PART_HAIR_REGROW && !psys->edit)))
+	{
 		return 1;
 	}
 
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index f676cfb2fb8..90d17e53349 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -2190,8 +2190,9 @@ void BKE_ptcache_id_clear(PTCacheID *pid, int mode, unsigned int cfra)
 								BLI_strncpy(num, de->d_name + (strlen(de->d_name) - 15), sizeof(num));
 								frame = atoi(num);
 								
-								if ((mode==PTCACHE_CLEAR_BEFORE && frame < cfra)	|| 
-								(mode==PTCACHE_CLEAR_AFTER && frame > cfra)	) {
+								if ((mode == PTCACHE_CLEAR_BEFORE && frame < cfra) ||
+								    (mode == PTCACHE_CLEAR_AFTER && frame > cfra))
+								{
 									
 									BLI_join_dirfile(path_full, sizeof(path_full), path, de->d_name);
 									BLI_delete(path_full, 0, 0);
@@ -2226,8 +2227,9 @@ void BKE_ptcache_id_clear(PTCacheID *pid, int mode, unsigned int cfra)
 			}
 			else {
 				while (pm) {
-					if ((mode==PTCACHE_CLEAR_BEFORE && pm->frame < cfra)	|| 
-					(mode==PTCACHE_CLEAR_AFTER && pm->frame > cfra)	) {
+					if ((mode == PTCACHE_CLEAR_BEFORE && pm->frame < cfra) ||
+					    (mode == PTCACHE_CLEAR_AFTER && pm->frame > cfra))
+					{
 						link = pm;
 						if (pid->cache->cached_frames && pm->frame >=sta && pm->frame <= end)
 							pid->cache->cached_frames[pm->frame-sta] = 0;
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 85027efa246..5abc4bc3830 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1054,11 +1054,12 @@ static int sb_detect_aabb_collisionCached(float UNUSED(force[3]), unsigned int U
 					a = ccdm->totface;
 #endif
 					if ((aabbmax[0] < ccdm->bbmin[0]) ||
-						(aabbmax[1] < ccdm->bbmin[1]) ||
-						(aabbmax[2] < ccdm->bbmin[2]) ||
-						(aabbmin[0] > ccdm->bbmax[0]) ||
-						(aabbmin[1] > ccdm->bbmax[1]) ||
-						(aabbmin[2] > ccdm->bbmax[2]) ) {
+					    (aabbmax[1] < ccdm->bbmin[1]) ||
+					    (aabbmax[2] < ccdm->bbmin[2]) ||
+					    (aabbmin[0] > ccdm->bbmax[0]) ||
+					    (aabbmin[1] > ccdm->bbmax[1]) ||
+					    (aabbmin[2] > ccdm->bbmax[2]) )
+					{
 						/* boxes don't intersect */
 						BLI_ghashIterator_step(ihash);
 						continue;
@@ -1125,11 +1126,12 @@ static int sb_detect_face_pointCached(float face_v1[3], float face_v2[3], float
 					mprevvert= ccdm->mprevvert;
 					outerfacethickness = ob->pd->pdef_sboft;
 					if ((aabbmax[0] < ccdm->bbmin[0]) ||
-						(aabbmax[1] < ccdm->bbmin[1]) ||
-						(aabbmax[2] < ccdm->bbmin[2]) ||
-						(aabbmin[0] > ccdm->bbmax[0]) ||
-						(aabbmin[1] > ccdm->bbmax[1]) ||
-						(aabbmin[2] > ccdm->bbmax[2]) ) {
+					    (aabbmax[1] < ccdm->bbmin[1]) ||
+					    (aabbmax[2] < ccdm->bbmin[2]) ||
+					    (aabbmin[0] > ccdm->bbmax[0]) ||
+					    (aabbmin[1] > ccdm->bbmax[1]) ||
+					    (aabbmin[2] > ccdm->bbmax[2]) )
+					{
 						/* boxes don't intersect */
 						BLI_ghashIterator_step(ihash);
 						continue;
@@ -1220,11 +1222,12 @@ static int sb_detect_face_collisionCached(float face_v1[3], float face_v2[3], fl
 					a = ccdm->totface;
 
 					if ((aabbmax[0] < ccdm->bbmin[0]) ||
-						(aabbmax[1] < ccdm->bbmin[1]) ||
-						(aabbmax[2] < ccdm->bbmin[2]) ||
-						(aabbmin[0] > ccdm->bbmax[0]) ||
-						(aabbmin[1] > ccdm->bbmax[1]) ||
-						(aabbmin[2] > ccdm->bbmax[2]) ) {
+					    (aabbmax[1] < ccdm->bbmin[1]) ||
+					    (aabbmax[2] < ccdm->bbmin[2]) ||
+					    (aabbmin[0] > ccdm->bbmax[0]) ||
+					    (aabbmin[1] > ccdm->bbmax[1]) ||
+					    (aabbmin[2] > ccdm->bbmax[2]) )
+					{
 						/* boxes don't intersect */
 						BLI_ghashIterator_step(ihash);
 						continue;
@@ -1447,11 +1450,12 @@ static int sb_detect_edge_collisionCached(float edge_v1[3], float edge_v2[3], fl
 					a = ccdm->totface;
 
 					if ((aabbmax[0] < ccdm->bbmin[0]) ||
-						(aabbmax[1] < ccdm->bbmin[1]) ||
-						(aabbmax[2] < ccdm->bbmin[2]) ||
-						(aabbmin[0] > ccdm->bbmax[0]) ||
-						(aabbmin[1] > ccdm->bbmax[1]) ||
-						(aabbmin[2] > ccdm->bbmax[2]) ) {
+					    (aabbmax[1] < ccdm->bbmin[1]) ||
+					    (aabbmax[2] < ccdm->bbmin[2]) ||
+					    (aabbmin[0] > ccdm->bbmax[0]) ||
+					    (aabbmin[1] > ccdm->bbmax[1]) ||
+					    (aabbmin[2] > ccdm->bbmax[2]) )
+					{
 						/* boxes don't intersect */
 						BLI_ghashIterator_step(ihash);
 						continue;
@@ -1785,14 +1789,15 @@ static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3],
 					maxz = ccdm->bbmax[2];
 
 					if ((opco[0] < minx) ||
-						(opco[1] < miny) ||
-						(opco[2] < minz) ||
-						(opco[0] > maxx) ||
-						(opco[1] > maxy) ||
-						(opco[2] > maxz) ) {
-							/* outside the padded boundbox --> collision object is too far away */
-												BLI_ghashIterator_step(ihash);
-							continue;
+					    (opco[1] < miny) ||
+					    (opco[2] < minz) ||
+					    (opco[0] > maxx) ||
+					    (opco[1] > maxy) ||
+					    (opco[2] > maxz) )
+					{
+						/* outside the padded boundbox --> collision object is too far away */
+						BLI_ghashIterator_step(ihash);
+						continue;
 					}
 				}
 				else {