diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-26 13:58:54 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-26 14:00:18 +0300 |
commit | b6cf4a715bf0031d429c81c1c9a7210dc1c9388a (patch) | |
tree | d91428a5bd40276f85f593b1552882b87e8c4c39 /source/blender/blenkernel/intern/scene.c | |
parent | 5b3530e4805f35202eeab57253c02b144f838134 (diff) |
Fix missing volume update via scene strip's settings
This is a part of T66117.
The entire sequencer+3d sound was never reliable, so this is as much as i can
fix currently.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 09e05a9d93a..d2d56569bff 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -2467,7 +2467,14 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene) } } } - if (seq->scene_sound) { + if (seq->scene_sound != NULL) { + /* Make sure changing volume via sequence's properties panel works correct. + * + * Ideally, the entire BKE_scene_update_sound() will happen from a dependency graph, so + * then it is no longer needed to do such manual forced updates. */ + if (seq->type == SEQ_TYPE_SCENE && seq->scene != NULL) { + BKE_sound_set_scene_volume(seq->scene, seq->scene->audio.volume); + } if (seq->sound != NULL) { if (scene->id.recalc & ID_RECALC_AUDIO || seq->sound->id.recalc & ID_RECALC_AUDIO) { BKE_sound_update_scene_sound(seq->scene_sound, seq->sound); |