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:
authorAristotelis Dossas <teldosas>2020-09-10 15:31:17 +0300
committerJeroen Bakker <jeroen@blender.org>2020-09-16 15:23:09 +0300
commit3be5697b889a9a3e677a504844e6b21eee0d753f (patch)
tree6b6b1e95ed03dccde6a71df1edf14c768275320f
parent0f928c5841671e119ad34c04cad5afc567414720 (diff)
Fix T79737: ERROR ACCESS VIOLATION when switching to eevee rendered view
This prevents Blender from crashing when switching to rendered view and the grid_data is NULL in the lightcache (due to possible corruption), by switching to the fallback lightcache. The fix extends the solution for possible corruption in the cube_data as well. Fix T79737 Reviewed By: fclem Differential Revision: https://developer.blender.org/D8835
-rw-r--r--source/blender/draw/engines/eevee/eevee_lightcache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index bb23e898f38..519753179da 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -381,8 +381,8 @@ LightCache *EEVEE_lightcache_create(const int grid_len,
static bool eevee_lightcache_static_load(LightCache *lcache)
{
/* We use fallback if a texture is not setup and there is no data to restore it. */
- if ((!lcache->grid_tx.tex && !lcache->grid_tx.data) ||
- (!lcache->cube_tx.tex && !lcache->cube_tx.data)) {
+ if ((!lcache->grid_tx.tex && !lcache->grid_tx.data) || !lcache->grid_data ||
+ (!lcache->cube_tx.tex && !lcache->cube_tx.data) || !lcache->cube_data) {
return false;
}
/* If cache is too big for this GPU. */