[Bf-blender-cvs] [11d440f1a26] blender-v2.83-release: Fix T76430: Quick smoke not rendering Cycles and Eevee

Sebastián Barschkis noreply at git.blender.org
Wed May 6 13:25:21 CEST 2020


Commit: 11d440f1a261a0b80d909af77261ee47710a4170
Author: Sebastián Barschkis
Date:   Wed May 6 13:24:53 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB11d440f1a261a0b80d909af77261ee47710a4170

Fix T76430: Quick smoke not rendering Cycles and Eevee

Temporary fix that will skip cache invalidation from flow / effector objects.

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

M	source/blender/blenkernel/intern/fluid.c

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 96efac8f2c5..7adac2d4a4d 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -3762,14 +3762,16 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd,
     MEM_freeN(objs);
   }
 
+  /* TODO (sebbas): Cache reset for when flow / effector object need update flag is set. */
+#  if 0
   /* If the just updated flags now carry the 'outdated' flag, reset the cache here!
    * Plus sanity check: Do not clear cache on file load. */
   if (mds->cache_flag & FLUID_DOMAIN_OUTDATED_DATA &&
       ((mds->flags & FLUID_DOMAIN_FILE_LOAD) == 0)) {
-    mds->cache_flag &= ~FLUID_DOMAIN_OUTDATED_DATA;
     BKE_fluid_cache_free_all(mds, ob);
     BKE_fluid_modifier_reset_ex(mmd, false);
   }
+#  endif
 
   /* Fluid domain init must not fail in order to continue modifier evaluation. */
   if (!mds->fluid && !BKE_fluid_modifier_init(mmd, depsgraph, ob, scene, me)) {



More information about the Bf-blender-cvs mailing list