diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-16 15:47:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-17 10:56:47 +0300 |
| commit | f8a70db5565413fc454091e4fbbc4a7b5fd92519 (patch) | |
| tree | f9daced891a4a9e736df53b79b733076b73b2ff5 /source/blender/windowmanager | |
| parent | d8cebcfebf5d82ef3c8e990da27f057af03e9977 (diff) | |
Fix T67047: Can't jump to frame when using jack in A/V sync mode
Similar fix to 495aff7.
Reviewers: brecht
Reviewed By: brecht
Maniphest Tasks: T67047
Differential Revision: https://developer.blender.org/D5268
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 4bda5167f60..76cb78b1e04 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -3235,7 +3235,11 @@ void wm_event_do_handlers(bContext *C) if (scene_eval != NULL) { const int is_playing_sound = BKE_sound_scene_playing(scene_eval); - if (is_playing_sound != -1) { + if (scene_eval->id.recalc & ID_RECALC_AUDIO_SEEK) { + /* Ignore seek here, the audio will be updated to the scene frame after jump during next + * dependency graph update. */ + } + else if (is_playing_sound != -1) { bool is_playing_screen; is_playing_screen = (ED_screen_animation_playing(wm) != NULL); |