[Bf-blender-cvs] [f8a70db5565] master: Fix T67047: Can't jump to frame when using jack in A/V sync mode
Sergey Sharybin
noreply at git.blender.org
Wed Jul 17 09:59:46 CEST 2019
Commit: f8a70db5565413fc454091e4fbbc4a7b5fd92519
Author: Sergey Sharybin
Date: Tue Jul 16 14:47:43 2019 +0200
Branches: master
https://developer.blender.org/rBf8a70db5565413fc454091e4fbbc4a7b5fd92519
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
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
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);
More information about the Bf-blender-cvs
mailing list