[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13791] trunk/blender/source/blender/src/ sequence.c: Allow sequencer to use scene strips with no camera, if those scenes also use

[Ken Hughes]

Revision: 13791
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13791
Author:   khughes
Date:     2008-02-21 02:35:20 +0100 (Thu, 21 Feb 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2008-02-21 01:19:42 UTC (rev 13790)
+++ trunk/blender/source/blender/src/sequence.c	2008-02-21 01:35:20 UTC (rev 13791)
@@ -1651,16 +1651,16 @@
 		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