diff options
author | Ton Roosendaal <ton@blender.org> | 2006-06-27 13:48:54 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-06-27 13:48:54 +0400 |
commit | f7c9c9987763bad926ffde91943d9db8964d4388 (patch) | |
tree | 2c1326d9322a8fcdf658439692a81aff7ed4cb0c /source/blender/src/renderwin.c | |
parent | 605388b44949ce10070b5e2178aea65a11667e54 (diff) |
Bugfixes from own collection:
- when renderwin exists, but not used for render, the ESC timer check still
could return ESC event, due to missing flag clearing.
(For example in sequencer, a scene strip did not update on frame advance)
- option 'single layer' set in combination with render "Do Sequence" didn't
free the pushed layers.
Diffstat (limited to 'source/blender/src/renderwin.c')
-rw-r--r-- | source/blender/src/renderwin.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 7e78501ed4e..1d1eca59696 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -733,7 +733,6 @@ static void renderwin_init_display_cb(RenderResult *rr) } renderwin_reset_view(render_win); - render_win->flags&= ~RW_FLAGS_ESCAPE; render_win->active= 1; } /* make sure we are in normal draw again */ @@ -1165,6 +1164,9 @@ void BIF_init_render_callbacks(Render *re, int do_display) RE_error_cb(re, error_cb); G.afbreek= 0; + if(render_win) + render_win->flags &= ~RW_FLAGS_ESCAPE; + /* start esc timer. ensure it happens once only */ if(esc_timer_set==0) init_test_break_callback(); |