[Bf-blender-cvs] [603a37fa89b] master: Fix T59719 Bake Indirect Lighting doesn't update env map reflection

[Clément Foucault]

Commit: 603a37fa89bd1db1dc3c717b8d4b76a3abbb759a
Author: Clément Foucault
Date:   Tue Mar 19 23:55:15 2019 +0100
Branches: master
https://developer.blender.org/rB603a37fa89bd1db1dc3c717b8d4b76a3abbb759a

Fix T59719 Bake Indirect Lighting doesn't update env map reflection

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

M	source/blender/draw/engines/eevee/eevee_engine.c
M	source/blender/draw/engines/eevee/eevee_lightprobes.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 54c1415ca49..b1e2f12788d 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -388,7 +388,7 @@ static void eevee_id_world_update(void *vedata, World *wo)
 	EEVEE_WorldEngineData *wedata = EEVEE_world_data_ensure(wo);
 
 	if (wedata != NULL && wedata->dd.recalc != 0) {
-		if ((lcache->flag & (LIGHTCACHE_BAKED | LIGHTCACHE_BAKING)) == 0) {
+		if ((lcache->flag & LIGHTCACHE_BAKING) == 0) {
 			lcache->flag |= LIGHTCACHE_UPDATE_WORLD;
 		}
 		wedata->dd.recalc = 0;
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 4baeff7ab5e..04e2cbb37ab 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -1209,7 +1209,9 @@ void EEVEE_lightprobes_refresh(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 	const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph);
 	LightCache *light_cache = vedata->stl->g_data->light_cache;
 
-	if (light_cache->flag & LIGHTCACHE_UPDATE_WORLD) {
+	if ((light_cache->flag & LIGHTCACHE_UPDATE_WORLD) &&
+	    (light_cache->flag & LIGHTCACHE_BAKED) == 0)
+	{
 		DRWMatrixState saved_mats;
 		DRW_viewport_matrix_get_all(&saved_mats);
 		EEVEE_lightbake_update_world_quick(sldata, vedata, scene_eval);