diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-25 16:56:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-25 16:56:29 +0400 |
| commit | 6b554c5ec4101bf1b9c3d82ff601190214684e05 (patch) | |
| tree | 730077464346af25f0a0c5f4141e2cf15655214f /source/blender/editors/screen | |
| parent | e2133842c0a4ac2671aa187f788f6c3ab5a6cb8e (diff) | |
Fix for last commit, forgot to update Screen.is_animation_playing python property.
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index a2fc763163a..37ab87780b5 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1750,7 +1750,7 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win = CTX_wm_window(C); Scene *scene = CTX_data_scene(C); - bScreen *stopscreen = ED_screen_animation_playing(C); + bScreen *stopscreen = ED_screen_animation_playing(wm); if (stopscreen) { WM_event_remove_timer(wm, win, stopscreen->animtimer); diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 5280968c11f..5faa2deb266 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3039,9 +3039,8 @@ static void SCREEN_OT_animation_step(wmOperatorType *ot) /* ****************** anim player, starts or ends timer ***************** */ /* find window that owns the animation timer */ -bScreen *ED_screen_animation_playing(const bContext *C) +bScreen *ED_screen_animation_playing(const wmWindowManager *wm) { - wmWindowManager *wm = CTX_wm_manager(C); wmWindow *window; for (window = wm->windows.first; window; window = window->next) @@ -3057,7 +3056,7 @@ int ED_screen_animation_play(bContext *C, int sync, int mode) bScreen *screen = CTX_wm_screen(C); Scene *scene = CTX_data_scene(C); - if (ED_screen_animation_playing(C)) { + if (ED_screen_animation_playing(CTX_wm_manager(C))) { /* stop playback now */ ED_screen_animation_timer(C, 0, 0, 0, 0); sound_stop_scene(scene); @@ -3114,7 +3113,7 @@ static void SCREEN_OT_animation_play(wmOperatorType *ot) static int screen_animation_cancel_exec(bContext *C, wmOperator *op) { - bScreen *screen = ED_screen_animation_playing(C); + bScreen *screen = ED_screen_animation_playing(CTX_wm_manager(C)); if (screen) { if (RNA_boolean_get(op->ptr, "restore_frame")) { |