[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28058] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix [#21257] Renders blank images when audio clip is present.

Matt Ebb matt at mke3.net
Wed Apr 7 03:21:20 CEST 2010


Revision: 28058
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28058
Author:   broken
Date:     2010-04-07 03:21:10 +0200 (Wed, 07 Apr 2010)

Log Message:
-----------
Fix [#21257] Renders blank images when audio clip is present.

Only render sequencer when there are non-audio strips on the timeline.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-04-07 00:54:13 UTC (rev 28057)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-04-07 01:21:10 UTC (rev 28058)
@@ -2403,6 +2403,24 @@
 	RE_ReleaseResultImage(re);
 }
 
+static int seq_render_active(Render *re)
+{
+	Editing *ed;
+	Sequence *seq;
+
+	ed = re->scene->ed;
+	
+	if (!(re->r.scemode & R_DOSEQ) || !ed || !ed->seqbase.first)
+		return 0;
+	
+	for (seq= ed->seqbase.first; seq; seq= seq->next) {
+		if (seq->type != SEQ_SOUND)
+			return 1;
+	}
+	
+	return 0;
+}
+
 static void do_render_seq(Render * re)
 {
 	static int recurs_depth = 0;
@@ -2484,7 +2502,7 @@
 	if(external_render_3d(re, 1)) {
 		/* in this case external render overrides all */
 	}
-	else if((re->r.scemode & R_DOSEQ) && re->scene->ed && re->scene->ed->seqbase.first) {
+	else if(seq_render_active(re)) {
 		/* note: do_render_seq() frees rect32 when sequencer returns float images */
 		if(!re->test_break(re->tbh)) 
 			do_render_seq(re);





More information about the Bf-blender-cvs mailing list