diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-13 18:33:26 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-13 18:33:40 +0300 |
| commit | 8b92d728ae158e26f9cc5ea9c804ed5dddea3685 (patch) | |
| tree | 6de62ff21afc270ef54838fc00ecc03db42b10b6 | |
| parent | 141c0f8ad1f23870e29b58566d71bd912625e93e (diff) | |
Fix T48421: AO pass broken, only works when AO in cycles is enabled
| -rw-r--r-- | intern/cycles/render/integrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp index be8fd552e78..fd4f34c8990 100644 --- a/intern/cycles/render/integrator.cpp +++ b/intern/cycles/render/integrator.cpp @@ -126,7 +126,7 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene kintegrator->layer_flag = layer_flag << PATH_RAY_LAYER_SHIFT; kintegrator->use_ambient_occlusion = - ((dscene->data.film.pass_flag & PASS_AO) || dscene->data.background.ao_factor != 0.0f); + ((Pass::contains(scene->film->passes, PASS_AO)) || dscene->data.background.ao_factor != 0.0f); kintegrator->sample_clamp_direct = (sample_clamp_direct == 0.0f)? FLT_MAX: sample_clamp_direct*3.0f; kintegrator->sample_clamp_indirect = (sample_clamp_indirect == 0.0f)? FLT_MAX: sample_clamp_indirect*3.0f; |