diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-07-05 19:47:15 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-07-05 19:47:15 +0400 |
| commit | bb15d0f60ff1165216db95ab08e509dc0d167d0d (patch) | |
| tree | 884b89612bb58a8991094bc83d9266324c45ea5d /source | |
| parent | 54931c11925e2a316c1306cbd62870e65a9f1023 (diff) | |
Bugfix #4609
ESC for OpenGL render (in anim) was hanging, so a 2nd anim render always
returned immediately.
Own bug collection: the SHIFT+NumPad-0 option didn't do an undo-push.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/renderwin.c | 3 | ||||
| -rw-r--r-- | source/blender/src/toets.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 071ff4107b3..760b1e1ef91 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1223,6 +1223,9 @@ void BIF_do_ogl_render(View3D *v3d, int anim) /* open window */ renderwin_init_display_cb(rr); + if(render_win) + render_win->flags &= ~RW_FLAGS_ESCAPE; + init_gl_stuff(); waitcursor(1); diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c index abb7578ec68..15a6fe1d420 100644 --- a/source/blender/src/toets.c +++ b/source/blender/src/toets.c @@ -285,6 +285,7 @@ void persptoetsen(unsigned short event) void setcameratoview3d(void); // view.c setcameratoview3d(); DAG_object_flush_update(G.scene, G.scene->camera, OB_RECALC_OB); + BIF_undo_push("View to Camera position"); allqueue(REDRAWVIEW3D, 0); } } |