[Bf-blender-cvs] [d48d8b34567] master: Fix T81761: EEVEE enabled AO pass affects render result

[Dalai Felinto]

Commit: d48d8b34567bd577d179099fc098879bf296289a
Author: Dalai Felinto
Date:   Sat Oct 17 12:55:04 2020 +0200
Branches: master
https://developer.blender.org/rBd48d8b34567bd577d179099fc098879bf296289a

Fix T81761: EEVEE enabled AO pass affects render result

This was a regression introduced on 68651534c263.

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

M	source/blender/draw/engines/eevee/eevee_occlusion.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c
index 46f9c775335..fd96a076c68 100644
--- a/source/blender/draw/engines/eevee/eevee_occlusion.c
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.c
@@ -64,7 +64,9 @@ int EEVEE_occlusion_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     common_data->ao_factor = scene_eval->eevee.gtao_factor;
     common_data->ao_quality = 1.0f - scene_eval->eevee.gtao_quality;
 
-    common_data->ao_settings = 1.0f; /* USE_AO */
+    if (scene_eval->eevee.flag & SCE_EEVEE_GTAO_ENABLED) {
+      common_data->ao_settings = 1.0f; /* USE_AO */
+    }
     if (scene_eval->eevee.flag & SCE_EEVEE_GTAO_BENT_NORMALS) {
       common_data->ao_settings += 2.0f; /* USE_BENT_NORMAL */
     }