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:
authorCampbell Barton <ideasman42@gmail.com>2010-03-09 16:52:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-03-09 16:52:52 +0300
commit5f7bcee541131be75b82e6d57dcc2ecc89303dd3 (patch)
treeafee4242142111a591b02b5ad08457a9e54be3ac /source/blender/blenloader
parent869b16d8948504b9a8d5b832936c7edb8e4668d4 (diff)
camera override option for scene strips.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b80e3df717c..7ba8386e9cf 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4143,6 +4143,7 @@ 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_camera) seq->scene_camera= newlibadr(fd, sce->id.lib, seq->scene_camera);
if(seq->sound) {
seq->scene_sound = NULL;
if(seq->type == SEQ_HD_SOUND)
@@ -11572,6 +11573,7 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
SEQ_BEGIN(sce->ed, seq) {
if(seq->scene) expand_doit(fd, mainvar, seq->scene);
+ if(seq->scene_camera) expand_doit(fd, mainvar, seq->scene_camera);
if(seq->sound) expand_doit(fd, mainvar, seq->sound);
}
SEQ_END