Allow sequencer to use scene strips with no camera, if those scenes also use
authorKen Hughes <khughes@pacific.edu>
Thu, 21 Feb 2008 01:35:20 +0000 (01:35 +0000)
committerKen Hughes <khughes@pacific.edu>
Thu, 21 Feb 2008 01:35:20 +0000 (01:35 +0000)
the sequencer.  This time, actually apply patch to the file before submmiting.

source/blender/src/sequence.c

index 8ddca579636c9112455c99bbcf48b5d674af1ecd..30ba671688b4c36371d31fdf7120ae137bdbf0e6 100644 (file)
@@ -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