[Bf-blender-cvs] [0b86943641e] master: Fix T74901: Smoke Simulation crashes on eevee and is not persistent on Cycles

Sebastián Barschkis noreply at git.blender.org
Fri Apr 10 12:10:29 CEST 2020


Commit: 0b86943641ec59d7f1a0799c0f709e4f23d619f8
Author: Sebastián Barschkis
Date:   Fri Apr 10 12:10:13 2020 +0200
Branches: master
https://developer.blender.org/rB0b86943641ec59d7f1a0799c0f709e4f23d619f8

Fix T74901: Smoke Simulation crashes on eevee and is not persistent on Cycles

Issue was introduced in 5260aaf3b1c8 (fix for T73921).

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

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 9447c365c48..614c749b9aa 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -777,8 +777,6 @@ static void eevee_lightbake_delete_resources(EEVEE_LightBake *lbake)
   if (!lbake->resource_only) {
     BLI_mutex_unlock(lbake->mutex);
   }
-
-  EEVEE_volumes_free_smoke_textures();
 }
 
 /* Cache as in draw cache not light cache. */
@@ -1347,6 +1345,9 @@ void EEVEE_lightbake_job(void *custom_data, short *stop, short *do_update, float
   }
 
   eevee_lightbake_delete_resources(lbake);
+
+  /* Free GPU smoke textures and the smoke domain list correctly: See also T73921.*/
+  EEVEE_volumes_free_smoke_textures();
 }
 
 /* This is to update the world irradiance and reflection contribution from



More information about the Bf-blender-cvs mailing list