From e8d532f1dde96c40c1407d39260724fcfee0b606 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 31 Mar 2013 03:28:46 +0000
Subject: style cleanup

---
 source/blender/blenkernel/intern/brush.c           | 6 +++---
 source/blender/blenkernel/intern/image.c           | 2 +-
 source/blender/blenkernel/intern/particle_system.c | 4 ++--
 source/blender/blenkernel/intern/pointcache.c      | 2 +-
 source/blender/blenkernel/intern/sca.c             | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source/blender/blenkernel')

diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 6dcd394c92a..3fbbbc84ef4 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -574,13 +574,13 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br,
 			y = point_2d[1] - ups->tex_mouse[1];
 
 			/* use pressure adjusted size for fixed mode */
-			invradius = 1.0/ups->pixel_radius;
+			invradius = 1.0f / ups->pixel_radius;
 		}
 		else if (mtex->brush_map_mode == MTEX_MAP_MODE_TILED) {
 			/* leave the coordinates relative to the screen */
 
 			/* use unadjusted size for tiled mode */
-			invradius = 1.0/BKE_brush_size_get(scene, br);
+			invradius = 1.0f / BKE_brush_size_get(scene, br);
 
 			x = point_2d[0];
 			y = point_2d[1];
@@ -591,7 +591,7 @@ float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br,
 			x = point_2d[0] - ups->tex_mouse[0];
 			y = point_2d[1] - ups->tex_mouse[1];
 
-			invradius = 1.0/ups->pixel_radius;
+			invradius = 1.0f / ups->pixel_radius;
 		}
 
 		x *= invradius;
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 843c3d66e58..64bc4928e35 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3011,7 +3011,7 @@ static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
 					*lock_r = ima;
 
 					/* XXX anim play for viewer nodes not yet supported */
-					frame = 0; // XXX iuser?iuser->framenr:0;
+					frame = 0; // XXX iuser ? iuser->framenr : 0;
 					ibuf = image_get_ibuf(ima, 0, frame);
 
 					if (!ibuf) {
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 3efe25794e1..5124cb1da26 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -1346,7 +1346,7 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D
 	ctx->jitoff= jitter_offset;
 	ctx->weight= element_weight;
 	ctx->maxweight= maxweight;
-	ctx->from= (children)? PART_FROM_CHILD: from;
+	ctx->from= (children) ? PART_FROM_CHILD : from;
 	ctx->cfrom= cfrom;
 	ctx->distr= distr;
 	ctx->dm= dm;
@@ -2039,7 +2039,7 @@ static void set_keyed_keys(ParticleSimulationData *sim)
 
 		ksim.psys->flag |= keyed_flag;
 
-		pt = (pt->next && pt->next->flag & PTARGET_VALID)? pt->next : psys->targets.first;
+		pt = (pt->next && pt->next->flag & PTARGET_VALID) ? pt->next : psys->targets.first;
 	}
 
 	psys->flag |= PSYS_KEYED;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 8034c4d1de9..c119eb07779 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1396,7 +1396,7 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob, Scene *scene, int dup
 
 static int ptcache_path(PTCacheID *pid, char *filename)
 {
-	Library *lib= (pid->ob)? pid->ob->id.lib: NULL;
+	Library *lib = (pid->ob) ? pid->ob->id.lib : NULL;
 	const char *blendfilename= (lib && (pid->cache->flag & PTCACHE_IGNORE_LIBPATH)==0) ? lib->filepath: G.main->name;
 	size_t i;
 
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index 6433b73fda0..92f57a54a01 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -705,7 +705,7 @@ void sca_move_sensor(bSensor *sens_to_move, Object *ob, int move_up)
 	bSensor *sens, *tmp;
 
 	int val;
-	val = move_up ? 1:2;
+	val = move_up ? 1 : 2;
 
 	/* make sure this sensor belongs to this object */
 	sens= ob->sensors.first;
@@ -744,7 +744,7 @@ void sca_move_controller(bController *cont_to_move, Object *ob, int move_up)
 	bController *cont, *tmp;
 
 	int val;
-	val = move_up ? 1:2;
+	val = move_up ? 1 : 2;
 
 	/* make sure this controller belongs to this object */
 	cont= ob->controllers.first;
@@ -787,7 +787,7 @@ void sca_move_actuator(bActuator *act_to_move, Object *ob, int move_up)
 	bActuator *act, *tmp;
 	int val;
 
-	val = move_up ? 1:2;
+	val = move_up ? 1 : 2;
 
 	/* make sure this actuator belongs to this object */
 	act= ob->actuators.first;
-- 
cgit v1.2.3