[Bf-blender-cvs] [3d7a00b8aa1] master: Fix (unreported) light cache bake crash

Philipp Oeser noreply at git.blender.org
Tue Mar 2 17:57:28 CET 2021


Commit: 3d7a00b8aa174069cf622952dbddda6201fbf653
Author: Philipp Oeser
Date:   Tue Mar 2 17:46:15 2021 +0100
Branches: master
https://developer.blender.org/rB3d7a00b8aa174069cf622952dbddda6201fbf653

Fix (unreported) light cache bake crash

missing NULL check if there is no cache there to begin with.

Differential Revision: https://developer.blender.org/D10581

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

M	source/blender/draw/engines/eevee/eevee_lightcache.c

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

diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index c2bd0d2b971..37ecdb20651 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -313,11 +313,14 @@ static bool EEVEE_lightcache_validate(const LightCache *light_cache,
                                       const int grid_len,
                                       const int irr_size[3])
 {
+  if (light_cache == NULL) {
+    return false;
+  }
   if (!eevee_lightcache_version_check(light_cache)) {
     return false;
   }
 
-  if (light_cache && !(light_cache->flag & LIGHTCACHE_INVALID)) {
+  if (!(light_cache->flag & LIGHTCACHE_INVALID)) {
     /* See if we need the same amount of texture space. */
     if ((irr_size[0] == light_cache->grid_tx.tex_size[0]) &&
         (irr_size[1] == light_cache->grid_tx.tex_size[1]) &&



More information about the Bf-blender-cvs mailing list