diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-09-20 21:55:03 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-09-20 21:55:03 +0400 |
| commit | 189263e1d9cd1cfdb2e9a96a01761858e8deaa7c (patch) | |
| tree | 7a413876e0f1b29318490e21c95f026f1ddd44d7 /source/blender/blenkernel/intern/sound.c | |
| parent | 4f6ea2b683b81fe12642f92e8f0e0d48904f2c6c (diff) | |
Sound:
* Fixed mixdown volume being int instead of float
* Fixed audio muting for sequencer not working
* Added 3D listener settings with RNA (not working in GE yet)
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index fdf6283925e..c6c4a776faf 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -340,7 +340,7 @@ void sound_update_playing(struct bContext *C) for(handle = scene->sound_handles.first; handle; handle = handle->next) { - if(cfra < handle->startframe || cfra >= handle->endframe || handle->mute) + if(cfra < handle->startframe || cfra >= handle->endframe || handle->mute || (scene->audio.flag & AUDIO_MUTE)) { if(handle->state == AUD_STATUS_PLAYING) { |