diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-29 13:52:03 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-29 13:52:03 +0300 |
| commit | 8b84c5f9de32e42e835a15aa1ef05504d0a4c198 (patch) | |
| tree | c2f9253aee1185379cee3909a2487c7f851c9ac2 /source/blender/editors/screen/screen_ops.c | |
| parent | 18c0a15e1ebaa94177b848a2dc6ccc96a38dc5ed (diff) | |
Port optimization from gooseberry branch:
Treat scrubbing as animation.
This is checked during various updates to avoid
some costly calculations.
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
| -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 571dab6a65e..b157c914eda 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3626,7 +3626,7 @@ bScreen *ED_screen_animation_playing(const wmWindowManager *wm) wmWindow *win; for (win = wm->windows.first; win; win = win->next) { - if (win->screen->animtimer) { + if (win->screen->animtimer || win->screen->scrubbing) { return win->screen; } } |