[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27516] branches/render25/source/blender/ render/intern/source/shadeoutput.c: Render Branch: tweak to ambient occlusion multiply mode, now it is also

[Brecht Van Lommel]

Revision: 27516
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27516
Author:   blendix
Date:     2010-03-15 14:47:35 +0100 (Mon, 15 Mar 2010)

Log Message:
-----------
Render Branch: tweak to ambient occlusion multiply mode, now it is also
applied to env/indirect intead of only direct light.

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-03-15 12:35:14 UTC (rev 27515)
+++ branches/render25/source/blender/render/intern/source/shadeoutput.c	2010-03-15 13:47:35 UTC (rev 27516)
@@ -679,14 +679,14 @@
 				|| (passflag & (SCE_PASS_AO|SCE_PASS_ENVIRONMENT|SCE_PASS_INDIRECT)))
 				ambient_occlusion(re, shi);
 
-			if(re->db.wrld.mode & WO_AMB_OCC)
-				ambient_occlusion_apply(re, shi, shr);
-
 			if(re->db.wrld.mode & WO_ENV_LIGHT)
 				environment_lighting_apply(re, shi, shr);
 
 			if(re->db.wrld.mode & WO_INDIRECT_LIGHT)
 				indirect_lighting_apply(re, shi, shr);
+
+			if(re->db.wrld.mode & WO_AMB_OCC)
+				ambient_occlusion_apply(re, shi, shr);
 		}
 	}