Code cleanup: remove references to svn and code style

4 files changed, 10 insertions, 8 deletions

diff --git a/source/blender/blenkernel/intern/tracking_detect.c b/source/blender/blenkernel/intern/tracking_detect.c
index 65fd997ae6c..a5a8ec87721 100644
--- a/source/blender/blenkernel/intern/tracking_detect.c
+++ b/source/blender/blenkernel/intern/tracking_detect.c
@@ -116,8 +116,8 @@ static void detect_retrieve_libmv_features(MovieTracking *tracking, ListBase *tr
 		/* In Libmv integer coordinate points to pixel center, in blender
 		 * it's not. Need to add 0.5px offset to center.
 		 */
-		xu = (x + 0.5f) / width;
-		yu = (y + 0.5f) / height;
+		xu = (x + 0.5) / width;
+		yu = (y + 0.5) / height;
 
 		if (layer)
 			ok = check_point_in_layer(layer, xu, yu) != place_outside_layer;
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 38a8d2e2a4c..541d10637d5 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -332,7 +332,8 @@ static int write_video_frame(RenderData *rd, int cfra, AVFrame *frame, ReportLis
 		if (packet.dts != AV_NOPTS_VALUE) {
 			packet.dts = av_rescale_q(packet.dts, c->time_base, video_stream->time_base);
 			PRINT("Video Frame DTS: %d\n", (int)packet.dts);
-		} else {
+		}
+		else {
 			PRINT("Video Frame DTS: not set\n");
 		}
 
@@ -976,7 +977,8 @@ static void flush_ffmpeg(void)
 		if (packet.dts != AV_NOPTS_VALUE) {
 			packet.dts = av_rescale_q(packet.dts, c->time_base, video_stream->time_base);
 			PRINT("Video Frame DTS: %d\n", (int) packet.dts);
-		} else {
+		}
+		else {
 			PRINT("Video Frame DTS: not set\n");
 		}
 
diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c
index 45a9c5837d5..3812d2955c9 100644
--- a/source/blender/blenlib/intern/smallhash.c
+++ b/source/blender/blenlib/intern/smallhash.c
@@ -96,8 +96,8 @@ BLI_INLINE SmallHashEntry *smallhash_lookup_first_free(SmallHash *hash, uintptr_
 	unsigned int hoff = 1;
 
 	for (entry = &hash->table[h % hash->size];
-		 !ELEM(entry->val, SMHASH_CELL_UNUSED, SMHASH_CELL_FREE);
-		 h = SMHASH_NEXT(h, hoff), entry = &hash->table[h % hash->size])
+	     !ELEM(entry->val, SMHASH_CELL_UNUSED, SMHASH_CELL_FREE);
+	     h = SMHASH_NEXT(h, hoff), entry = &hash->table[h % hash->size])
 	{
 		/* Nothing else to do! */
 	}
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 5d992824e3b..8d66a94f423 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -1031,7 +1031,7 @@ static void gp_stroke_to_path(bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Curv
 			p[0] += GAP_DFAC;  /* Rather arbitrary... */
 			dt = GAP_DFAC;  /* Rather arbitrary too! */
 		}
-		/* Note bp has alredy been incremented in main loop above, so it points to the right place. */
+		/* Note bp has already been incremented in main loop above, so it points to the right place. */
 		gp_stroke_to_path_add_point(gtd, bp, p, prev_bp->vec, do_gtd, gps->inittime, dt, 0.0f, rad_fac, minmax_weights);
 	}
 
@@ -1297,7 +1297,7 @@ static void gp_stroke_to_bezier(bContext *C, bGPDlayer *gpl, bGPDstroke *gps, Cu
 		/* The end point */
 		interp_v3_v3v3(h1, p, prev_bezt->vec[1], BEZT_HANDLE_FAC);
 		interp_v3_v3v3(h2, p, prev_bezt->vec[1], -BEZT_HANDLE_FAC);
-		/* Note bezt has alredy been incremented in main loop above, so it points to the right place. */
+		/* Note bezt has already been incremented in main loop above, so it points to the right place. */
 		gp_stroke_to_bezier_add_point(gtd, bezt, p, h1, h2, prev_bezt->vec[1], do_gtd, gps->inittime, dt,
 		                              0.0f, rad_fac, minmax_weights);
 	}