Cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Apr 2015 22:46:48 +0000 (08:46 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Apr 2015 22:46:48 +0000 (08:46 +1000)
source/blender/blenkernel/BKE_writeframeserver.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenlib/intern/BLI_filelist.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_view3d/view3d_draw.c

index 2f8bce31e419615bbc560206a104313507e28c53..0837e9bce794b319d692b08f3acb3bbaf6f3c898 100644 (file)
@@ -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);
index 942426febdd757a71a0b36b0b7348d1e5d6ae02e..8c803f86979be50ea99d09974a8e29fdada6f955 100644 (file)
@@ -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) {
index f032b753a7757cf1265a03240240014ae5a59cd5..81813ce1f629956c4301be22f28cb925acefbed4 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenlib/intern/filelist.c
+/** \file blender/blenlib/intern/BLI_filelist.c
  *  \ingroup bli
  */
 
index 3201a81d90c870578b037ec247fe1bb283a1acbc..70c7cc9e878d1ea84c90f8cf366d4816643e0c0b 100644 (file)
@@ -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;
index 95a1ab873485d4edb0141b7fe7339fb45b959278..195dffe74a0ca065811915f16f54392c3f312cc7 100644 (file)
@@ -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);
        }