diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-13 12:58:21 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-03-13 12:58:21 +0300 |
| commit | 2c937f0769b1a41b16814cdadea936e21973d45b (patch) | |
| tree | 7e2d98ea99ed3462328b8e291740cae7fe2f8c1c /source/blender/render/intern/source/shadeoutput.c | |
| parent | 4247984df3c7a34875a1f21bfde6bb954485a84a (diff) | |
Fix for bug #8502: AO was being computed unnecessarily if it was
excluded from the combined pass and the AO pass was disabled.
Diffstat (limited to 'source/blender/render/intern/source/shadeoutput.c')
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 303511c3a5d..315ca58efc8 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -1578,7 +1578,8 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr) /* AO pass */ if(R.wrld.mode & WO_AMB_OCC) { - if(passflag & (SCE_PASS_COMBINED|SCE_PASS_AO)) { + if(((passflag & SCE_PASS_COMBINED) && (shi->combinedflag & SCE_PASS_AO)) + || (passflag & SCE_PASS_AO)) { /* AO was calculated for scanline already */ if(shi->depth) ambient_occlusion(shi); |