[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14204] trunk/blender/source/blender/ render/intern/source/pipeline.c: This commit disables fix for revision 14202 effectively.

[Ton Roosendaal]

Revision: 14204
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14204
Author:   ton
Date:     2008-03-21 23:26:26 +0100 (Fri, 21 Mar 2008)

Log Message:
-----------
This commit disables fix for revision 14202 effectively.

The claim was:
Bugfix: don't do full sample merging on re-rendered layers in
the compositor.

But result was that rendering didn't happen at all for scenes
with a composite.

I also don't understand the commit, seems like it's incomplete?

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14202

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-03-21 21:03:31 UTC (rev 14203)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2008-03-21 22:26:26 UTC (rev 14204)
@@ -2156,7 +2156,7 @@
 			ntreeCompositTagAnimated(ntree);
 		}
 		
-		if(!(re->r.scemode & R_COMP_RERENDER)) {
+		if(1 || !(re->r.scemode & R_COMP_RERENDER)) {
 			if(ntree && re->r.scemode & R_DOCOMP) {
 				/* checks if there are render-result nodes that need scene */
 				if((re->r.scemode & R_SINGLE_LAYER)==0)