blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix VSE not able to playback after scrubbing (and a couple of crashes) 

After scrubbing, Blender kept thinking an animation is played (see animation "Play" button), even after mouse release. This resulted in a couple of crashes, e.g. by pressing Alt+a and then Esc.

(Also minor cleanup)
This commit is contained in:
Julian Eisel 2015-08-01 23:55:33 +02:00
parent a3c5de3e3c
commit 2ec0d53034
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/animation/anim_ops.c
View File

@ -148,24 +148,34 @@ 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);
bScreen *screen = CTX_wm_screen(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;
if (screen)
screen->scrubbing = true;
}
}
static void change_frame_seq_preview_end(bContext *C)
{
bScreen *screen = CTX_wm_screen(C);
bool notify = false;
if (screen->scrubbing) {
screen->scrubbing = false;
notify = true;
}
if (ED_sequencer_special_preview_get() != NULL) {
wmWindow *win = CTX_wm_window(C);
Scene *scene = CTX_data_scene(C);
ED_sequencer_special_preview_clear();
notify = true;
}
if (notify) {
Scene *scene = CTX_data_scene(C);
WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
if (win->screen)
win->screen->scrubbing = false;
}
}