diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-06 14:25:48 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-06 14:25:48 +0300 |
| commit | 578e97671083455e271ac4dfff4e81fdd63ce1d5 (patch) | |
| tree | 11b495b78d2d5f576aef3c86f661fc7ac3ffc08c /source/blender/blenkernel | |
| parent | f90c93b2c3cdb3d479774e8398211f054f22e57b (diff) | |
| parent | 11d440f1a261a0b80d909af77261ee47710a4170 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 5340fa63f38..e1682c557c8 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -3739,14 +3739,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)) { |