blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T74446: Liquid Inflow Does Not Work 

Somehow this was forgotton in the optimization patch a5c4a44df6.
This commit is contained in:
Sebastián Barschkis 2020-03-05 11:40:59 +01:00
parent c328049535
commit 4ccbbd3080
Notes: blender-bot 2023-02-14 08:35:51 +01:00 
Referenced by issue #74446, Liquid Inflow Does Not Work
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/mantaflow/intern/strings/liquid_script.h
View File

@ -187,6 +187,7 @@ def liquid_adaptive_step_$ID$(framenr):\n\
extrapolateLsSimple(phi=phiObs_s$ID$, distance=3)\n\
\n\
mantaMsg('Initializing fluid levelset')\n\
phiIn_s$ID$.join(phiSIn_s$ID$) # Join static flow map\n\
extrapolateLsSimple(phi=phiIn_s$ID$, distance=6, inside=True)\n\
extrapolateLsSimple(phi=phiIn_s$ID$, distance=3)\n\
phi_s$ID$.join(phiIn_s$ID$)\n\

1
intern/mantaflow/intern/strings/smoke_script.h
View File

@ -290,6 +290,7 @@ def smoke_adaptive_step_$ID$(framenr):\n\
extrapolateLsSimple(phi=phiObs_s$ID$, distance=3, inside=False)\n\
\n\
mantaMsg('Initializing fluid levelset')\n\
phiIn_s$ID$.join(phiSIn_s$ID$) # Join static flow map\n\
extrapolateLsSimple(phi=phiIn_s$ID$, distance=6, inside=True)\n\
extrapolateLsSimple(phi=phiIn_s$ID$, distance=3, inside=False)\n\
\n\

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

@ -626,7 +626,6 @@ static void clamp_bounds_in_domain(FluidDomainSettings *mds,
static bool is_static_object(Object *ob)
{
/* Check if the object has modifiers that might make the object "dynamic". */
ModifierData *md = ob->modifiers.first;
for (; md; md = md->next) {