code cleanup: python/pep8 and double-promotion warnings.

4 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index b6b4501ca5a..5bae967165c 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -970,7 +970,7 @@ static void do_sub_effect_byte(float facf0, float facf1, int x, int y, unsigned
 			tempc[2] = max_ff(rt1[2] - fac1 * rt2[2], 0.0f);
 			tempc[3] = max_ff(rt1[3] - fac1 * rt2[3], 0.0f);
 
-			if (tempc[3] < 1e-6)
+			if (tempc[3] < 1e-6f)
 				tempc[3] = 0.0f;
 
 			premul_float_to_straight_uchar(rt, tempc);
@@ -992,7 +992,7 @@ static void do_sub_effect_byte(float facf0, float facf1, int x, int y, unsigned
 			tempc[2] = max_ff(rt1[2] - fac3 * rt2[2], 0.0f);
 			tempc[3] = max_ff(rt1[3] - fac3 * rt2[3], 0.0f);
 
-			if (tempc[3] < 1e-6)
+			if (tempc[3] < 1e-6f)
 				tempc[3] = 0.0f;
 
 			premul_float_to_straight_uchar(rt, tempc);
@@ -1024,7 +1024,7 @@ static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *r
 			rt[2] = max_ff(rt1[2] - fac1 * rt2[2], 0.0f);
 			rt[3] = max_ff(rt1[3] - fac1 * rt2[3], 0.0f);
 
-			if (rt[3] < 1e-6)
+			if (rt[3] < 1e-6f)
 				rt[3] = 0.0f;
 
 			rt1 += 4; rt2 += 4; rt += 4;
@@ -1041,7 +1041,7 @@ static void do_sub_effect_float(float facf0, float facf1, int x, int y, float *r
 			rt[2] = max_ff(rt1[2] - fac3 * rt2[2], 0.0f);
 			rt[3] = max_ff(rt1[3] - fac3 * rt2[3], 0.0f);
 
-			if (rt[3] < 1e-6)
+			if (rt[3] < 1e-6f)
 				rt[3] = 0.0f;
 
 			rt1 += 4; rt2 += 4; rt += 4;
diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c
index e83cc8ae3ea..b8b78aab277 100644
--- a/source/blender/bmesh/operators/bmo_create.c
+++ b/source/blender/bmesh/operators/bmo_create.c
@@ -109,7 +109,7 @@ void bmo_contextual_create_exec(BMesh *bm, BMOperator *op)
 				else                 ok = false;  /* only ever want one of these */
 			}
 			else if (tot_edges == 1) {
-				if (v_a == NULL)       v_a = v;
+				if      (v_a == NULL)  v_a = v;
 				else if (v_b == NULL)  v_b = v;
 				else                   ok = false;  /* only ever want 2 of these */
 			}
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index cdb89a66867..62537fb713f 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -823,9 +823,10 @@ static int node_select_same_type_step_exec(bContext *C, wmOperator *op)
 
 		/* is note outside view? */
 		if (active->totr.xmax < ar->v2d.cur.xmin || active->totr.xmin > ar->v2d.cur.xmax ||
-			active->totr.ymax < ar->v2d.cur.ymin || active->totr.ymin > ar->v2d.cur.ymax)
-				space_node_view_flag(C, snode, CTX_wm_region(C), NODE_SELECT);
-
+		    active->totr.ymax < ar->v2d.cur.ymin || active->totr.ymin > ar->v2d.cur.ymax)
+		{
+			space_node_view_flag(C, snode, CTX_wm_region(C), NODE_SELECT);
+		}
 	}
 	
 	if (node_array)
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 67b0f920662..193af2f92c6 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -229,7 +229,7 @@ void WM_init(bContext *C, int argc, const char **argv)
 		 * however python is not initialized when called from this function.
 		 *
 		 * unlikey any handlers are set but its possible,
-		 * note that recovering the last session does its own callbacks callbacks. */
+		 * note that recovering the last session does its own callbacks. */
 		BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);
 	}
 }