[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13668] trunk/blender/source/blender/ render/intern/source:
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Feb 13 14:25:19 CET 2008
Revision: 13668
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13668
Author: blendix
Date: 2008-02-13 14:25:19 +0100 (Wed, 13 Feb 2008)
Log Message:
-----------
Fix for bug #7863: AO made normal map baking unnecessarily slow.
Fix for bug #8226: approximate AO doesn't bake.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/rendercore.c
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2008-02-13 11:18:08 UTC (rev 13667)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2008-02-13 13:25:19 UTC (rev 13668)
@@ -5141,6 +5141,11 @@
if(!re->test_break())
if(re->r.mode & R_RAYTRACE)
makeraytree(re);
+
+ /* occlusion */
+ if((re->wrld.mode & WO_AMB_OCC) && !re->test_break())
+ if(re->wrld.ao_gather_method == WO_AOGATHER_APPROX)
+ make_occ_tree(re);
}
/* ------------------------------------------------------------------------- */
Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c 2008-02-13 11:18:08 UTC (rev 13667)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c 2008-02-13 13:25:19 UTC (rev 13668)
@@ -1837,7 +1837,8 @@
else {
shade_input_set_shade_texco(shi);
- shade_samples_do_AO(ssamp);
+ if(!ELEM(bs->type, RE_BAKE_NORMALS, RE_BAKE_TEXTURE))
+ shade_samples_do_AO(ssamp);
if(shi->mat->nodetree && shi->mat->use_nodes) {
ntreeShaderExecTree(shi->mat->nodetree, shi, &shr);
More information about the Bf-blender-cvs
mailing list