[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43778] trunk/blender/source/blender/ render/intern/source/shadeoutput.c: Fix #30026: errors rendering material with ambient 0 and AO/env/indirect light.

[Brecht Van Lommel]

Revision: 43778
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43778
Author:   blendix
Date:     2012-01-30 19:47:30 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Fix #30026: errors rendering material with ambient 0 and AO/env/indirect light.
It would skip rendering the latter if ambient was 0, however this is not actually
used in adding the contribution from these.

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	2012-01-30 19:46:15 UTC (rev 43777)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c	2012-01-30 19:47:30 UTC (rev 43778)
@@ -1030,9 +1030,9 @@
 /* preprocess, textures were not done, don't use shi->amb for that reason */
 void ambient_occlusion(ShadeInput *shi)
 {
-	if((R.wrld.ao_gather_method == WO_AOGATHER_APPROX) && shi->mat->amb!=0.0f)
+	if(R.wrld.ao_gather_method == WO_AOGATHER_APPROX)
 		sample_occ(&R, shi);
-	else if((R.r.mode & R_RAYTRACE) && shi->mat->amb!=0.0f)
+	else if(R.r.mode & R_RAYTRACE)
 		ray_ao(shi, shi->ao, shi->env);
 	else
 		shi->ao[0]= shi->ao[1]= shi->ao[2]= 1.0f;