diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
| commit | 4aa82806effa9e114f14f88d7b2da23b0a2bcca6 (patch) | |
| tree | 6741012808ab0c83f96ff7e52c8168cb62b8c8b7 /source/blender/render | |
| parent | 35678eaae52a8436469b06307eaaf4d8503863f1 (diff) | |
| parent | ed0d2b5e9205fc99ed38957f01acaa62c3811333 (diff) | |
svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index e2cfd25c40b..0e9cfd11a68 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -1030,9 +1030,9 @@ static void do_specular_ramp(ShadeInput *shi, float is, float t, float spec[3]) /* preprocess, textures were not done, don't use shi->amb for that reason */ void ambient_occlusion(ShadeInput *shi) { - if((R.wrld.ao_gather_method == WO_AOGATHER_APPROX) && shi->mat->amb!=0.0f) + if(R.wrld.ao_gather_method == WO_AOGATHER_APPROX) sample_occ(&R, shi); - else if((R.r.mode & R_RAYTRACE) && shi->mat->amb!=0.0f) + else if(R.r.mode & R_RAYTRACE) ray_ao(shi, shi->ao, shi->env); else shi->ao[0]= shi->ao[1]= shi->ao[2]= 1.0f; |