[Bf-blender-cvs] [83e83c6] gooseberry: Bring back audio scrub after last commit

Antony Riakiotakis noreply at git.blender.org
Thu Apr 30 17:27:27 CEST 2015


Commit: 83e83c6de79e70722faf32f38938a451727d8c33
Author: Antony Riakiotakis
Date:   Thu Apr 30 17:27:14 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB83e83c6de79e70722faf32f38938a451727d8c33

Bring back audio scrub after last commit

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

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

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

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index fb5d87d..b27485d 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -615,7 +615,7 @@ void BKE_sound_seek_scene(struct Main *bmain, struct Scene *scene)
 
 	animation_playing = 0;
 	for (screen = bmain->screen.first; screen; screen = screen->id.next) {
-		if (screen->animtimer || screen->scrubbing) {
+		if (screen->animtimer) {
 			animation_playing = 1;
 			break;
 		}




More information about the Bf-blender-cvs mailing list