diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-26 06:27:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-26 06:27:54 +0300 |
| commit | f0863f2a803d63c4bc9e3012a7fb6ceb4c194219 (patch) | |
| tree | 58a53050e1827f06f4c6460ad209b3e7f868af44 /source/blender/editors/screen | |
| parent | 3cbf77b34f7f15c134c8df4d129fe08c0d34d111 (diff) | |
| parent | ce531ed1a12edcc51b717cbc12e38e8550e8f979 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index b5bf60e92c5..b8fa16117a9 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3724,7 +3724,7 @@ static int screen_animation_cancel_exec(bContext *C, wmOperator *op) bScreen *screen = ED_screen_animation_playing(CTX_wm_manager(C)); if (screen) { - if (RNA_boolean_get(op->ptr, "restore_frame")) { + if (RNA_boolean_get(op->ptr, "restore_frame") && screen->animtimer) { ScreenAnimData *sad = screen->animtimer->customdata; Scene *scene = CTX_data_scene(C); |