[Bf-blender-cvs] [8b92d72] master: Fix T48421: AO pass broken, only works when AO in cycles is enabled

[Sergey Sharybin]

Commit: 8b92d728ae158e26f9cc5ea9c804ed5dddea3685
Author: Sergey Sharybin
Date:   Fri May 13 17:33:26 2016 +0200
Branches: master
https://developer.blender.org/rB8b92d728ae158e26f9cc5ea9c804ed5dddea3685

Fix T48421: AO pass broken, only works when AO in cycles is enabled

===================================================================

M	intern/cycles/render/integrator.cpp

===================================================================

diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index be8fd55..fd4f34c 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;