[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27368] branches/render25/source/blender/ render/intern/source/diskocclusion.c: Render Branch: make approximate AO work with bump mapping.

[Brecht Van Lommel]

Revision: 27368
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27368
Author:   blendix
Date:     2010-03-09 19:43:58 +0100 (Tue, 09 Mar 2010)

Log Message:
-----------
Render Branch: make approximate AO work with bump mapping.

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

Modified: branches/render25/source/blender/render/intern/source/diskocclusion.c
===================================================================
--- branches/render25/source/blender/render/intern/source/diskocclusion.c	2010-03-09 17:36:23 UTC (rev 27367)
+++ branches/render25/source/blender/render/intern/source/diskocclusion.c	2010-03-09 18:43:58 UTC (rev 27368)
@@ -1081,12 +1081,19 @@
 {
 	OcclusionTree *tree= re->db.occlusiontree;
 	OccFace exclude;
+	float *vn;
 	int onlyshadow;
 
 	onlyshadow= (shi->material.mat->mode & MA_ONLYSHADOW);
 	exclude.obi= shi->primitive.obi - re->db.objectinstance;
 	exclude.facenr= shi->primitive.vlr->index;
-	sample_occ_tree(re, tree, &exclude, shi->geometry.co, shi->geometry.vno, shi->shading.thread, onlyshadow, shi->shading.ao, shi->shading.env, shi->shading.indirect);
+
+	if(re->db.wrld.ao_bump_method == WO_LIGHT_BUMP_NONE)
+		vn= shi->geometry.vno;
+	else
+		vn= shi->geometry.vn;
+
+	sample_occ_tree(re, tree, &exclude, shi->geometry.co, vn, shi->shading.thread, onlyshadow, shi->shading.ao, shi->shading.env, shi->shading.indirect);
 }
 
 void disk_occlusion_sample(Render *re, ShadeInput *shi)