Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-07-29 13:52:03 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-07-29 13:52:03 +0300
commit8b84c5f9de32e42e835a15aa1ef05504d0a4c198 (patch)
treec2f9253aee1185379cee3909a2487c7f851c9ac2 /source/blender/editors/animation
parent18c0a15e1ebaa94177b848a2dc6ccc96a38dc5ed (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/animation')
-rw-r--r--source/blender/editors/animation/anim_ops.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index 2de42933dc0..20d1dbe5751 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -148,18 +148,24 @@ static void change_frame_seq_preview_begin(bContext *C, const wmEvent *event)
{
ScrArea *sa = CTX_wm_area(C);
if (sa && sa->spacetype == SPACE_SEQ) {
+ wmWindow *win = CTX_wm_window(C);
SpaceSeq *sseq = sa->spacedata.first;
if (ED_space_sequencer_check_show_strip(sseq)) {
ED_sequencer_special_preview_set(C, event->mval);
}
+ if (win->screen)
+ win->screen->scrubbing = true;
}
}
static void change_frame_seq_preview_end(bContext *C)
{
if (ED_sequencer_special_preview_get() != NULL) {
+ wmWindow *win = CTX_wm_window(C);
Scene *scene = CTX_data_scene(C);
ED_sequencer_special_preview_clear();
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
+ if (win->screen)
+ win->screen->scrubbing = false;
}
}