[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28280] branches/render25/source/blender/ render/intern/source/shadeoutput.c: Render Branch: Fix missing AO pass with SSS materials, forgot to check for

[Brecht Van Lommel]

Revision: 28280
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28280
Author:   blendix
Date:     2010-04-19 11:50:02 +0200 (Mon, 19 Apr 2010)

Log Message:
-----------
Render Branch: Fix missing AO pass with SSS materials, forgot to check for
this case in optimizations.

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

Modified: branches/render25/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- branches/render25/source/blender/render/intern/source/shadeoutput.c	2010-04-19 09:38:36 UTC (rev 28279)
+++ branches/render25/source/blender/render/intern/source/shadeoutput.c	2010-04-19 09:50:02 UTC (rev 28280)
@@ -697,7 +697,7 @@
 	int passflag= shi->shading.passflag;
 	int post_sss= ((ma->sss_flag & MA_DIFF_SSS) && sss_pass_done(re, ma));
 
-	if(!post_sss) {
+	if(!post_sss || (passflag & (SCE_PASS_AO|SCE_PASS_ENVIRONMENT|SCE_PASS_INDIRECT))) {
 		shade_compute_ao(re, shi, shr); /* .ao */
 
 		/* add AO in combined? */