[Bf-blender-cvs] [1b9f151] master: Cleanup

[Campbell Barton]

Commit: 1b9f1519bc5c8d1739371f417cc8b23a8d483c8e
Author: Campbell Barton
Date:   Tue Apr 7 08:46:48 2015 +1000
Branches: master
https://developer.blender.org/rB1b9f1519bc5c8d1739371f417cc8b23a8d483c8e

Cleanup

===================================================================

M	source/blender/blenkernel/BKE_writeframeserver.h
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/blenlib/intern/BLI_filelist.c
M	source/blender/blenloader/intern/versioning_270.c
M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_writeframeserver.h b/source/blender/blenkernel/BKE_writeframeserver.h
index 2f8bce3..0837e9b 100644
--- a/source/blender/blenkernel/BKE_writeframeserver.h
+++ b/source/blender/blenkernel/BKE_writeframeserver.h
@@ -40,11 +40,13 @@ struct RenderData;
 struct ReportList;
 struct Scene;
 
-int BKE_frameserver_start(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty,
-                          struct ReportList *reports, bool preview, const char *suffix);
+int BKE_frameserver_start(
+        void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty,
+        struct ReportList *reports, bool preview, const char *suffix);
 void BKE_frameserver_end(void *context_v);
-int BKE_frameserver_append(void *context_v, struct RenderData *rd, int start_frame, int frame, int *pixels,
-                           int rectx, int recty, const char*suffix, struct ReportList *reports);
+int BKE_frameserver_append(
+        void *context_v, struct RenderData *rd, int start_frame, int frame, int *pixels,
+        int rectx, int recty, const char *suffix, struct ReportList *reports);
 int BKE_frameserver_loop(void *context_v, struct RenderData *rd, struct ReportList *reports);
 void *BKE_frameserver_context_create(void);
 void BKE_frameserver_context_free(void *context_v);
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 942426f..8c803f8 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -867,7 +867,7 @@ void BKE_sequence_reload_new_file(Scene *scene, Sequence *seq, const bool lock_r
 
 						seq_multiview_name(scene, i, prefix, ext, str, FILE_MAX);
 						anim = openanim(str, IB_rect | ((seq->flag & SEQ_FILTERY) ? IB_animdeinterlace : 0),
-										seq->streamindex, seq->strip->colorspace_settings.name);
+						                seq->streamindex, seq->strip->colorspace_settings.name);
 						seq_anim_add_suffix(scene, anim, i);
 
 						if (anim) {
diff --git a/source/blender/blenlib/intern/BLI_filelist.c b/source/blender/blenlib/intern/BLI_filelist.c
index f032b75..81813ce 100644
--- a/source/blender/blenlib/intern/BLI_filelist.c
+++ b/source/blender/blenlib/intern/BLI_filelist.c
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenlib/intern/filelist.c
+/** \file blender/blenlib/intern/BLI_filelist.c
  *  \ingroup bli
  */
 
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 3201a81..70c7cc9 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -730,8 +730,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 #undef SEQ_USE_PROXY_CUSTOM_FILE
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 274, 4))
-	{
+	if (!MAIN_VERSION_ATLEAST(main, 274, 4)) {
 		SceneRenderView *srv;
 		wmWindowManager *wm;
 		bScreen *screen;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 95a1ab8..195dffe 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3264,7 +3264,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Scene *scene, View3D *v3d, ARegion *ar, in
 		BKE_camera_to_gpu_dof(camera, &fx_settings);
 
 		ED_view3d_draw_offscreen(
-            scene, v3d, ar, sizex, sizey, NULL, params.winmat,
+		        scene, v3d, ar, sizex, sizey, NULL, params.winmat,
 		        draw_background, draw_sky, !params.is_ortho,
 		        ofs, NULL, &fx_settings, viewname);
 	}