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

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Feb 19 20:26:49 CET 2008


Revision: 13771
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13771
Author:   blendix
Date:     2008-02-19 20:26:49 +0100 (Tue, 19 Feb 2008)

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

Fix for bug #6911: radiosity pass can no be excluded.

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

Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c	2008-02-19 18:47:09 UTC (rev 13770)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c	2008-02-19 19:26:49 UTC (rev 13771)
@@ -1685,9 +1685,15 @@
 	
 	/* from now stuff everything in shr->combined: ambient, AO, radio, ramps, exposure */
 	if(!(ma->sss_flag & MA_DIFF_SSS) || !has_sss_tree(&R, ma)) {
-		shr->combined[0]+= shi->ambr + shi->r*shi->amb*shi->rad[0];
-		shr->combined[1]+= shi->ambg + shi->g*shi->amb*shi->rad[1];
-		shr->combined[2]+= shi->ambb + shi->b*shi->amb*shi->rad[2];
+		shr->combined[0]+= shi->ambr;
+		shr->combined[1]+= shi->ambg;
+		shr->combined[2]+= shi->ambb;
+
+		if(shi->combinedflag & SCE_PASS_RADIO) {
+			shr->combined[0]+= shi->r*shi->amb*shi->rad[0];
+			shr->combined[1]+= shi->g*shi->amb*shi->rad[1];
+			shr->combined[2]+= shi->b*shi->amb*shi->rad[2];
+		}
 		
 		/* add AO in combined? */
 		if(R.wrld.mode & WO_AMB_OCC) {





More information about the Bf-blender-cvs mailing list