Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-02-22 22:29:15 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-02-22 22:29:15 +0300
commit28fb57804835e41f51da9bfdecda6b49ede439f2 (patch)
treeac3c747ddbc683bff91ba752f6a0337d193703f5 /source
parent380cd248f48a11e048339dc65a6259fcea9cc0cd (diff)
Fix for bug #8329: approximate AO with shadow disabled gave artifacts.
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/convertblender.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 4245fd06fab..55a1dd664b2 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -4727,7 +4727,8 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view)
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 @@ void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob)
/* 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);
}
/* ------------------------------------------------------------------------- */