diff options
| author | Ken Hughes <khughes@pacific.edu> | 2008-02-21 04:35:20 +0300 |
|---|---|---|
| committer | Ken Hughes <khughes@pacific.edu> | 2008-02-21 04:35:20 +0300 |
| commit | 91d44a91249355827b6f135ab6e4fc52bfe926e4 (patch) | |
| tree | 9aea2080c12e547d372f47d0a53a1819637c25fe /source/blender/src/sequence.c | |
| parent | cf2e89c2850829db513f22bc7d0a2116b6dcd71d (diff) | |
Allow sequencer to use scene strips with no camera, if those scenes also use
the sequencer. This time, actually apply patch to the file before submmiting.
Diffstat (limited to 'source/blender/src/sequence.c')
| -rw-r--r-- | source/blender/src/sequence.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 8ddca579636..30ba671688b 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -1651,16 +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 && seq->scene->camera && !build_proxy_run) { + if (se->ibuf==NULL && sce && (sce->camera || sce->r.scemode & R_DOSEQ) && !build_proxy_run) { se->ibuf = seq_proxy_fetch(seq, cfra); if (se->ibuf) { input_preprocess(seq, se, cfra); } } - if (seq->scene && seq->scene->camera==NULL) { + if (sce && sce->camera==NULL && (sce->r.scemode & R_DOSEQ) == 0) { se->ok = STRIPELEM_FAILED; - } else if (se->ibuf==NULL && seq->scene && seq->scene->camera) { + } else if (se->ibuf==NULL && sce && (sce->camera || sce->r.scemode & R_DOSEQ) ) { waitcursor(1); /* Hack! This function can be called from do_render_seq(), in that case |