[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29471] branches/render25/source/blender/ render/intern/source/shadeoutput.c: Render Branch: remove unnecessary call to ambient_occlusion().

[Brecht Van Lommel]

Revision: 29471
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29471
Author:   blendix
Date:     2010-06-15 20:11:52 +0200 (Tue, 15 Jun 2010)

Log Message:
-----------
Render Branch: remove unnecessary call to ambient_occlusion().

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-06-15 18:11:03 UTC (rev 29470)
+++ branches/render25/source/blender/render/intern/source/shadeoutput.c 
2010-06-15 18:11:52 UTC (rev 29471)
@@ -704,10 +704,6 @@
                /* add AO in combined? */
                if((re->params.r.mode & R_RAYTRACE) || 
re->db.wrld.ao_gather_method == WO_LIGHT_GATHER_APPROX) {
                        if(re->db.wrld.mode & 
(WO_AMB_OCC|WO_ENV_LIGHT|WO_INDIRECT_LIGHT)) {
-                               if(((passflag & SCE_PASS_COMBINED) && 
(shi->shading.combinedflag & 
(SCE_PASS_AO|SCE_PASS_ENVIRONMENT|SCE_PASS_INDIRECT)))
-                                       || (passflag & 
(SCE_PASS_AO|SCE_PASS_ENVIRONMENT|SCE_PASS_INDIRECT)))
-                                       ambient_occlusion(re, shi);
-
                                if(re->db.wrld.mode & WO_ENV_LIGHT)
                                        environment_lighting_apply(re, shi, 
shr);
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs