[Bf-blender-cvs] [71b1ee940bb] master: Don't take into account time remapping when scrubbing with AV sync.

Sebastian Parborg noreply at git.blender.org
Mon Apr 6 16:34:21 CEST 2020


Commit: 71b1ee940bb0b8e159700e53137883b6995859ce
Author: Sebastian Parborg
Date:   Mon Apr 6 16:32:30 2020 +0200
Branches: master
https://developer.blender.org/rB71b1ee940bb0b8e159700e53137883b6995859ce

Don't take into account time remapping when scrubbing with AV sync.

It would cause the playhead to be remapped to an other frame than the
one you clicked on.

===================================================================

M	source/blender/blenkernel/intern/sound.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index c26df027368..64fe396d6a3 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -812,7 +812,7 @@ void BKE_sound_seek_scene(Main *bmain, Scene *scene)
   int animation_playing;
 
   const float one_frame = (float)(1.0 / FPS);
-  const float cur_time = get_cur_time(scene);
+  const float cur_time = FRA2TIME(CFRA);
 
   AUD_Device_lock(sound_device);



More information about the Bf-blender-cvs mailing list