[Bf-blender-cvs] [adf1b93] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: adf1b932f0092d3a814bcd7aa6827c53e3b520f7
Author: Antony Riakiotakis
Date:   Fri May 15 17:32:45 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBadf1b932f0092d3a814bcd7aa6827c53e3b520f7

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/animation/anim_draw.c

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



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

diff --cc source/blender/blenkernel/intern/sound.c
index d5454ba,46a5091..81cc55f
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@@ -604,15 -604,15 +604,15 @@@ void BKE_sound_seek_scene(struct Main *
  		}
  	}
  
 -	if (scene->audio.flag & AUDIO_SCRUB && !animation_playing) {
 +	if ((scene->audio.flag & AUDIO_SCRUB) && !animation_playing) {
  		if (scene->audio.flag & AUDIO_SYNC) {
- 			AUD_seek(scene->sound_scene_handle, cur_time);
- 			AUD_seekSequencer(scene->sound_scene_handle, cur_time);
+ 			AUD_seek(scene->playback_handle, cur_time);
+ 			AUD_seekSequencer(scene->playback_handle, cur_time);
  		}
  		else {
- 			AUD_seek(scene->sound_scene_handle, cur_time);
+ 			AUD_seek(scene->playback_handle, cur_time);
  		}
- 		AUD_resume(scene->sound_scene_handle);
+ 		AUD_resume(scene->playback_handle);
  		if (scene->sound_scrub_handle && AUD_getStatus(scene->sound_scrub_handle) != AUD_STATUS_INVALID) {
  			AUD_seek(scene->sound_scrub_handle, 0);
  		}