tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup

This commit is contained in:
Campbell Barton 2015-04-07 08:46:48 +10:00
parent 3dcdacffca
commit 1b9f1519bc
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/BKE_writeframeserver.h
View 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);

2
source/blender/blenkernel/intern/sequencer.c
View 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) {

2
source/blender/blenlib/intern/BLI_filelist.c
View File

@ -18,7 +18,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/blenlib/intern/filelist.c
/** \file blender/blenlib/intern/BLI_filelist.c
* \ingroup bli
*/

3
source/blender/blenloader/intern/versioning_270.c
View 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;

2
source/blender/editors/space_view3d/view3d_draw.c
View 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);
}