[Bf-blender-cvs] [eace5903cb7] master: Fix T67741 EEVEE: World update don't update lightcache if one viewport uses lookdev
Clément Foucault
noreply at git.blender.org
Wed Jun 24 22:12:18 CEST 2020
Commit: eace5903cb7d6c77207ad31453aee8e8d151f8b1
Author: Clément Foucault
Date: Wed Jun 24 22:12:09 2020 +0200
Branches: master
https://developer.blender.org/rBeace5903cb7d6c77207ad31453aee8e8d151f8b1
Fix T67741 EEVEE: World update don't update lightcache if one viewport uses lookdev
Just a matter of not clearing the updating flag in this case.
===================================================================
M source/blender/draw/engines/eevee/eevee_engine.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index d2369145d83..14918d407fa 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -402,6 +402,11 @@ static void eevee_id_world_update(void *vedata, World *wo)
EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl;
LightCache *lcache = stl->g_data->light_cache;
+ if (lcache == NULL || lcache == stl->lookdev_lightcache) {
+ /* Avoid Lookdev viewport clearing the update flag (see T67741). */
+ return;
+ }
+
EEVEE_WorldEngineData *wedata = EEVEE_world_data_ensure(wo);
if (wedata != NULL && wedata->dd.recalc != 0) {
More information about the Bf-blender-cvs
mailing list