Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / kernel / kernel_path_branched.h
index 66f67c3e2c4388af8075147774c7dc330063c4c7..80fcf5b056557153e55a7b03891167cc1a5f4488 100644 (file)
@@ -526,7 +526,7 @@ ccl_device void kernel_branched_path_integrate(KernelGlobals *kg,
 
 #ifdef __AO__
                /* ambient occlusion */
-               if(kernel_data.integrator.use_ambient_occlusion || (sd.flag & SD_AO)) {
+               if(kernel_data.integrator.use_ambient_occlusion) {
                        kernel_branched_path_ao(kg, &sd, emission_sd, L, &state, throughput);
                }
 #endif  /* __AO__ */