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>2008-02-17 23:44:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2008-02-17 23:44:07 +0300
commit164806013261b02ec59545e2c203b8d8e2b5358a (patch)
tree97efa2d68e437b77166dd6d76a2a64401b0af14e /source/blender/src/sequence.c
parent601c7cc318df35fc57d7c18428114a0d59bc73d1 (diff)
Bugfix [#8196] sequencer crash when adding scene without camera
added checks for a camera Also added an error ob bake if there are no active objects.
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r--source/blender/src/sequence.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index de5b1d708f2..ad379826016 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -1651,14 +1651,16 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
int doseq, rendering= G.rendering;
char scenename[64];
- if (se->ibuf==NULL && seq->scene && !build_proxy_run) {
+ if (se->ibuf==NULL && seq->scene && seq->scene->camera && !build_proxy_run) {
se->ibuf = seq_proxy_fetch(seq, cfra);
if (se->ibuf) {
input_preprocess(seq, se, cfra);
}
}
-
- if (se->ibuf==NULL && seq->scene) {
+
+ if (seq->scene && seq->scene->camera==NULL) {
+ se->ok = STRIPELEM_FAILED;
+ } else if (se->ibuf==NULL && seq->scene && seq->scene->camera) {
waitcursor(1);
/* Hack! This function can be called from do_render_seq(), in that case
@@ -1715,7 +1717,11 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
CFRA = oldcfra;
if (!build_proxy_run) {
- input_preprocess(seq, se, cfra);
+ if(se->ibuf == NULL) {
+ se->ok = STRIPELEM_FAILED;
+ } else {
+ input_preprocess(seq, se, cfra);
+ }
}
}