[Bf-blender-cvs] [768706c6a58] blender2.8: Fix eevee render settings not working

[Dalai Felinto]

Commit: 768706c6a58fe6b93f3534ca65d1912cbf066e68
Author: Dalai Felinto
Date:   Fri May 25 19:50:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB768706c6a58fe6b93f3534ca65d1912cbf066e68

Fix eevee render settings not working

This was no longer working since 15c2801aac33.

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

M	source/blender/draw/engines/eevee/eevee_bloom.c
M	source/blender/draw/engines/eevee/eevee_depth_of_field.c
M	source/blender/draw/engines/eevee/eevee_occlusion.c
M	source/blender/draw/engines/eevee/eevee_subsurface.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c
index f644b59c0b7..8be9c637fbc 100644
--- a/source/blender/draw/engines/eevee/eevee_bloom.c
+++ b/source/blender/draw/engines/eevee/eevee_bloom.c
@@ -92,7 +92,7 @@ int EEVEE_bloom_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph);
 
-	if (scene_eval->flag & SCE_EEVEE_BLOOM_ENABLED) {
+	if (scene_eval->eevee.flag & SCE_EEVEE_BLOOM_ENABLED) {
 		const float *viewport_size = DRW_viewport_size_get();
 
 		/* Shaders */
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index c275a5005ff..60c6175f4fa 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -84,7 +84,7 @@ int EEVEE_depth_of_field_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *v
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph);
 
-	if (scene_eval->flag & SCE_EEVEE_DOF_ENABLED) {
+	if (scene_eval->eevee.flag & SCE_EEVEE_DOF_ENABLED) {
 		RegionView3D *rv3d = draw_ctx->rv3d;
 
 		if (!e_data.dof_downsample_sh) {
diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c
index 305daef87d1..f39fbe33a71 100644
--- a/source/blender/draw/engines/eevee/eevee_occlusion.c
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.c
@@ -77,7 +77,7 @@ int EEVEE_occlusion_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph);
 
-	if (scene_eval->flag & SCE_EEVEE_GTAO_ENABLED) {
+	if (scene_eval->eevee.flag & SCE_EEVEE_GTAO_ENABLED) {
 		const float *viewport_size = DRW_viewport_size_get();
 		const int fs_size[2] = {(int)viewport_size[0], (int)viewport_size[1]};
 
@@ -91,14 +91,14 @@ int EEVEE_occlusion_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 		common_data->ao_quality = 1.0f - scene_eval->eevee.gtao_quality;
 
 		common_data->ao_settings = 1.0f; /* USE_AO */
-		if (scene_eval->flag & SCE_EEVEE_GTAO_BENT_NORMALS) {
+		if (scene_eval->eevee.flag & SCE_EEVEE_GTAO_BENT_NORMALS) {
 			common_data->ao_settings += 2.0f; /* USE_BENT_NORMAL */
 		}
-		if (scene_eval->flag & SCE_EEVEE_GTAO_BOUNCE) {
+		if (scene_eval->eevee.flag & SCE_EEVEE_GTAO_BOUNCE) {
 			common_data->ao_settings += 4.0f; /* USE_DENOISE */
 		}
 
-		common_data->ao_bounce_fac = (scene_eval->flag & SCE_EEVEE_GTAO_BOUNCE) ? 1.0f : 0.0f;
+		common_data->ao_bounce_fac = (scene_eval->eevee.flag & SCE_EEVEE_GTAO_BOUNCE) ? 1.0f : 0.0f;
 
 		effects->gtao_horizons = DRW_texture_pool_query_2D(fs_size[0], fs_size[1], GPU_RGBA8,
 		                                                   &draw_engine_eevee_type);
@@ -141,7 +141,7 @@ void EEVEE_occlusion_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph);
 
-	if (scene_eval->flag & SCE_EEVEE_GTAO_ENABLED) {
+	if (scene_eval->eevee.flag & SCE_EEVEE_GTAO_ENABLED) {
 		DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
 		float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c
index 1a46e0b5c33..6ee3b9cc286 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -150,7 +150,7 @@ void EEVEE_subsurface_output_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph);
 
-	if (scene_eval->flag & SCE_EEVEE_SSS_ENABLED) {
+	if (scene_eval->eevee.flag & SCE_EEVEE_SSS_ENABLED) {
 		DRW_texture_ensure_fullscreen_2D(&txl->sss_dir_accum, GPU_RGBA16F, 0);
 		DRW_texture_ensure_fullscreen_2D(&txl->sss_col_accum, GPU_RGBA16F, 0);