[Bf-blender-cvs] [603894cc4df] fluid-mantaflow: Mantaflow: Fix caching bug from master merge review

Sebastián Barschkis noreply at git.blender.org
Mon May 27 11:30:06 CEST 2019


Commit: 603894cc4df9c0b6094f6afbc9cf3b5a2b6b9088
Author: Sebastián Barschkis
Date:   Mon May 27 11:29:45 2019 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB603894cc4df9c0b6094f6afbc9cf3b5a2b6b9088

Mantaflow: Fix caching bug from master merge review

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

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

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 58ebf06693d..74756c5c253 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3863,13 +3863,6 @@ static void smokeModifier_process(
       smokeModifier_reset_ex(smd, false);
     }
 
-    if (!sds->fluid && (scene_framenr != startframe) &&
-        (sds->flags & FLUID_DOMAIN_FILE_LOAD) == 0 && !is_baking) {
-      return;
-    }
-
-    sds->flags &= ~FLUID_DOMAIN_FILE_LOAD;
-
     if (smokeModifier_init(smd, depsgraph, ob, scene, me) == 0) {
       return;
     }



More information about the Bf-blender-cvs mailing list