diff --git a/source/blender/include/BIF_renderwin.h b/source/blender/include/BIF_renderwin.h index d5b934d9050..a997efb336d 100644 --- a/source/blender/include/BIF_renderwin.h +++ b/source/blender/include/BIF_renderwin.h @@ -52,7 +52,7 @@ void BIF_redraw_render_rect(void); void BIF_swap_render_rects(void); void BIF_toggle_render_display(void); -void BIF_init_render_callbacks(struct Render *re); +void BIF_init_render_callbacks(struct Render *re, int do_display); void BIF_end_render_callbacks(void); /* should not be here, ~WIP~ */ diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 1a4d025acb0..6b02a41cc8d 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1096,8 +1096,9 @@ static void threaded_tile_processor(Render *re) if(rr==NULL) return; - if(re->test_break()) - return; + /* warning; no return here without closing exr file */ +// if(re->re->test_break()) +// return; initparts(re); diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 6790bca70a6..7e78501ed4e 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1064,7 +1064,7 @@ static void do_render(int anim) G.rendering= 1; /* set render callbacks, also starts ESC timer */ - BIF_init_render_callbacks(re); + BIF_init_render_callbacks(re, 1); waitcursor(1); if(render_win) @@ -1146,19 +1146,20 @@ static int esc_timer_set= 0; /* set callbacks, exported to sequence render too. Only call in foreground (UI) renders. */ -void BIF_init_render_callbacks(Render *re) +void BIF_init_render_callbacks(Render *re, int do_display) { - - if(G.displaymode!=R_DISPLAYWIN) { - if(render_win) - BIF_close_render_display(); - imagewindow_render_callbacks(re); - } - else { - RE_display_init_cb(re, renderwin_init_display_cb); - RE_display_draw_cb(re, renderwin_progress_display_cb); - RE_display_clear_cb(re, renderwin_clear_display_cb); - RE_stats_draw_cb(re, renderwin_renderinfo_cb); + if(do_display) { + if(G.displaymode!=R_DISPLAYWIN) { + if(render_win) + BIF_close_render_display(); + imagewindow_render_callbacks(re); + } + else { + RE_display_init_cb(re, renderwin_init_display_cb); + RE_display_draw_cb(re, renderwin_progress_display_cb); + RE_display_clear_cb(re, renderwin_clear_display_cb); + RE_stats_draw_cb(re, renderwin_renderinfo_cb); + } } RE_error_cb(re, error_cb); diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index a11c018dc0e..97d92110296 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -909,7 +909,7 @@ static void do_build_seq_ibuf(Sequence * seq, int cfra) doseq= sce->r.scemode & R_DOSEQ; sce->r.scemode &= ~R_DOSEQ; - BIF_init_render_callbacks(re); + BIF_init_render_callbacks(re, 0); /* 0= no display callbacks */ /* hrms, set_scene still needed? work on that... */ if(sce!=oldsce) set_scene_bg(sce);