blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Sebastián Barschkis 2020-05-06 13:25:48 +02:00
parent f90c93b2c3 11d440f1a2
commit 578e976710
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/fluid.c
View File

@ -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)) {