Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2010-03-20 14:15:16 +0300
committerJoerg Mueller <nexyon@gmail.com>2010-03-20 14:15:16 +0300
commit1e2be7a8c6e32589be706da407f75cddf879c077 (patch)
treee2be9c3f6156d5d1a95c3bcf29634a54923d2f64 /source/blender/blenloader
parent3dde2e224ad1b31d918fcffbac5e66bd5ffb629a (diff)
"Fix" aka implementation of [#21548] Audio doesn't work when adding scenes with audio to another scene.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index cc8686c89ba..747920e68ce 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4143,7 +4143,10 @@ static void lib_link_scene(FileData *fd, Main *main)
SEQ_BEGIN(sce->ed, seq) {
if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
- if(seq->scene) seq->scene= newlibadr(fd, sce->id.lib, seq->scene);
+ if(seq->scene) {
+ seq->scene= newlibadr(fd, sce->id.lib, seq->scene);
+ seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs);
+ }
if(seq->scene_camera) seq->scene_camera= newlibadr(fd, sce->id.lib, seq->scene_camera);
if(seq->sound) {
seq->scene_sound = NULL;