diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-07 12:27:34 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-07 12:59:30 +0300 |
| commit | 7081935a307b1dbdb3d8c564611c5f82c45d1ec2 (patch) | |
| tree | db4247dd2a668b125c2b11a2d82fb984575716d9 /source/blender/blenkernel/intern/scene.c | |
| parent | d4a5691d0fd5be0517968a95ebbe84778fb82b3a (diff) | |
Sequencer: Fix missing sound from nested scene strips
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 350b046e54d..ef33cd7d137 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -2454,8 +2454,16 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene) BKE_sound_ensure_scene(scene); Sequence *seq; SEQ_BEGIN (scene->ed, seq) { - if (seq->sound != NULL && seq->scene_sound == NULL) { - seq->scene_sound = BKE_sound_add_scene_sound_defaults(scene, seq); + if (seq->scene_sound == NULL) { + if (seq->sound != NULL) { + seq->scene_sound = BKE_sound_add_scene_sound_defaults(scene, seq); + } + else if (seq->type == SEQ_TYPE_SCENE) { + if (seq->scene != NULL) { + BKE_sound_ensure_scene(seq->scene); + seq->scene_sound = BKE_sound_scene_add_scene_sound_defaults(scene, seq); + } + } } if (seq->scene_sound) { BKE_sound_set_scene_sound_volume( |