Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-10-17 13:55:04 +0300
committerDalai Felinto <dalai@blender.org>2020-10-17 14:10:13 +0300
commitd48d8b34567bd577d179099fc098879bf296289a (patch)
treeb869e5cd07820c4429e33755eb3a02fcc7a55e79 /source/blender/draw/engines/eevee/eevee_occlusion.c
parent7447eb7e7430b924deab74b8541b3f56a540a6e9 (diff)
Fix T81761: EEVEE enabled AO pass affects render result
This was a regression introduced on 68651534c263.
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_occlusion.c')
-rw-r--r--source/blender/draw/engines/eevee/eevee_occlusion.c4
1 files changed, 3 insertions, 1 deletions
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 */
}