More Sequence render fixes:

- on load of .blend file, with Sequencer invoking a sequence render, the
  header window matrix was not set, giving "Insane icon" prints
- option "Do Sequence" had no re-display call in end
This commit is contained in:
Ton Roosendaal
2006-06-18 12:27:06 +00:00
parent 94e23fe939
commit 2a67e98359
3 changed files with 12 additions and 6 deletions

View File

@@ -1681,6 +1681,10 @@ static void do_render_all_options(Render *re)
if(re->r.scemode & R_DOSEQ) {
if(!re->test_break())
do_render_seq(re->result, re->r.cfra);
re->stats_draw(&re->i);
re->display_draw(re->result, NULL);
}
else {
if(re->r.renderer==R_YAFRAY)

View File

@@ -1783,7 +1783,9 @@ static void openheadwin(ScrArea *sa)
glMatrixMode(GL_MODELVIEW);
areawinar[sa->headwin]= sa; /* oterwise addqueue does not work */
areawinar[sa->headwin]= sa; /* otherwise addqueue does not work */
scrarea_do_headchange(sa); /* headchange is no callback, apply right away. this is for render-to-imagewindow... this can be called on startup by sequencer, which invokes redraw before all events are handled. bad stuff... */
addqueue(sa->headwin, CHANGED, 1);
}

View File

@@ -1176,12 +1176,12 @@ void BIF_init_render_callbacks(Render *re)
void BIF_end_render_callbacks(void)
{
esc_timer_set--;
if(esc_timer_set==0)
if(esc_timer_set==0) {
end_test_break_callback();
if(render_win)
mainwindow_make_active();
if(render_win)
mainwindow_make_active();
}
}
/* set up display, render an image or scene */