From 93ac4709ebe8c3be3d26b376248ce263ecc1974e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Barschkis?= Date: Fri, 13 Mar 2020 15:33:57 +0100 Subject: Fluid: Potential fix for Eevee tests crashing with Mantaflow Belongs to T73921. This commit fixes the crashes with light baking (disabled in f3a33a92987f). There is still a memory leak to be fixed though. --- source/blender/blenkernel/intern/fluid.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 9919a0d7385..fc29b4aae32 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -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; -- cgit v1.2.3