tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fluid: Potential fix for Eevee tests crashing with Mantaflow 

Belongs to T73921. This commit fixes the crashes with light baking (disabled in f3a33a9298). There is still a memory leak to be fixed though.
This commit is contained in:
Sebastián Barschkis 2020-03-13 15:33:57 +01:00
parent 525bd62557
commit 93ac4709eb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/mantaflow/intern/MANTA_main.cpp
View File

@ -171,9 +171,8 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID)
mMeshFromFile = false;
mParticlesFromFile = false;
// Only start Mantaflow once. No need to start whenever new FLUID objected is allocated
if (!mantaInitialized)
initializeMantaflow();
// Setup Mantaflow in Python
initializeMantaflow();
// Initialize Mantaflow variables in Python
// Liquid

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

@ -3674,8 +3674,9 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd,
/* Reset fluid if no fluid present (obviously)
* or if timeline gets reset to startframe */
if (!mds->fluid || is_startframe) {
if (!mds->fluid) {
BKE_fluid_modifier_reset_ex(mmd, false);
BKE_fluid_modifier_init(mmd, depsgraph, ob, scene, me);
}
/* Guiding parent res pointer needs initialization */
@ -3687,8 +3688,6 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd,
}
}
BKE_fluid_modifier_init(mmd, depsgraph, ob, scene, me);
/* ensure that time parameters are initialized correctly before every step */
float fps = scene->r.frs_sec / scene->r.frs_sec_base;
mds->frame_length = DT_DEFAULT * (25.0f / fps) * mds->time_scale;