diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-25 16:37:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-25 16:37:11 +0400 |
| commit | ad65b7b86b85aba39a2e686c6c5aacdec2c1b3ff (patch) | |
| tree | 21e8cf6e93a5a45efbe22aba69d914b60fd487ee /source/blender/editors/render | |
| parent | 942fcf44150aea4eea8e0f44de6b05229bb7c182 (diff) | |
Animation playback: now all windows are update during playback, rather than
just the active window.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 7b4dda1a48f..9ed9c150dcb 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -236,7 +236,7 @@ static int screen_render_exec(bContext *C, wmOperator *op) RE_SetReports(re, NULL); // no redraw needed, we leave state as we entered it - ED_update_for_newframe(mainp, scene, CTX_wm_screen(C), 1); + ED_update_for_newframe(mainp, scene, 1); WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene); @@ -408,7 +408,7 @@ static void render_endjob(void *rjv) /* else the frame will not update for the original value */ if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) - ED_update_for_newframe(G.main, rj->scene, rj->win->screen, 1); + ED_update_for_newframe(G.main, rj->scene, 1); /* XXX above function sets all tags in nodes */ ntreeCompositClearTags(rj->scene->nodetree); @@ -470,7 +470,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) Main *mainp; Scene *scene = CTX_data_scene(C); SceneRenderLayer *srl = NULL; - bScreen *screen = CTX_wm_screen(C); View3D *v3d = CTX_wm_view3d(C); Render *re; wmJob *steve; @@ -507,7 +506,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) mainp = CTX_data_main(C); /* cancel animation playback */ - if (screen->animtimer) + if (ED_screen_animation_playing(C)) ED_screen_animation_play(C, 0, 0); /* handle UI stuff */ |