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

[Brecht Van Lommel]

Revision: 13820
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13820
Author:   blendix
Date:     2008-02-22 20:29:15 +0100 (Fri, 22 Feb 2008)

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

Fix for bug #8329: approximate AO with shadow disabled gave artifacts.

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

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2008-02-22 18:26:51 UTC (rev 13819)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2008-02-22 19:29:15 UTC (rev 13820)
@@ -4727,7 +4727,8 @@
 		if((re->wrld.mode & WO_AMB_OCC) && !re->test_break())
 			if(re->wrld.ao_gather_method == WO_AOGATHER_APPROX)
 				if(re->r.renderer==R_INTERN)
-					make_occ_tree(re);
+					if(re->r.mode & R_SHADOW)
+						make_occ_tree(re);
 
 		/* SSS */
 		if((re->r.mode & R_SSS) && !re->test_break())
@@ -5323,7 +5324,8 @@
 	/* occlusion */
 	if((re->wrld.mode & WO_AMB_OCC) && !re->test_break())
 		if(re->wrld.ao_gather_method == WO_AOGATHER_APPROX)
-			make_occ_tree(re);
+			if(re->r.mode & R_SHADOW)
+				make_occ_tree(re);
 }
 
 /* ------------------------------------------------------------------------- */