[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13747] trunk/blender/source/blender/ render/intern/source/pipeline.c:

[Brecht Van Lommel]

Revision: 13747
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13747
Author:   blendix
Date:     2008-02-18 14:38:16 +0100 (Mon, 18 Feb 2008)

Log Message:
-----------

Bugfix for speed vector pass not being done when rendering a single
layer from the compositor. I've solved this by changing the behavior,
now it always renders a vector pass even if Do Composite is disabled.
I think that's more consistent because other passes get rendered too
regardless of Do Composite, the vector pass was just an exception.

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	2008-02-18 13:05:27 UTC (rev 13746)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2008-02-18 13:38:16 UTC (rev 13747)
@@ -601,14 +601,13 @@
 
 static int render_scene_needs_vector(Render *re)
 {
-	if((re->r.scemode & R_DOCOMP) || re->r.imtype==R_MULTILAYER) {
-		SceneRenderLayer *srl;
+	SceneRenderLayer *srl;
 	
-		for(srl= re->scene->r.layers.first; srl; srl= srl->next)
-			if(!(srl->layflag & SCE_LAY_DISABLE))
-				if(srl->passflag & SCE_PASS_VECTOR)
-					return 1;
-	}
+	for(srl= re->scene->r.layers.first; srl; srl= srl->next)
+		if(!(srl->layflag & SCE_LAY_DISABLE))
+			if(srl->passflag & SCE_PASS_VECTOR)
+				return 1;
+
 	return 0;
 }
 
@@ -1919,9 +1918,6 @@
 	/* initial setup */
 	RE_InitState(resc, re, &sce->r, winx, winy, &re->disprect);
 	
-	/* this to enable this scene to create speed vectors */
-	resc->r.scemode |= R_DOCOMP;
-	
 	/* still unsure entity this... */
 	resc->scene= sce;