diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-05 13:40:59 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-05 13:41:09 +0300 |
| commit | 4ccbbd308060f0330472828b317c59e054c9ee7b (patch) | |
| tree | 7e647c83b42bd9d4afe65852d30ad769c043fbfc /intern/mantaflow | |
| parent | c328049535a4bc9453f5e93365a00759347e3a05 (diff) | |
Fix T74446: Liquid Inflow Does Not Work
Somehow this was forgotton in the optimization patch a5c4a44df67e.
Diffstat (limited to 'intern/mantaflow')
| -rw-r--r-- | intern/mantaflow/intern/strings/liquid_script.h | 1 | ||||
| -rw-r--r-- | intern/mantaflow/intern/strings/smoke_script.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h index 1c3f576f1fa..d3ab4db954c 100644 --- a/intern/mantaflow/intern/strings/liquid_script.h +++ b/intern/mantaflow/intern/strings/liquid_script.h @@ -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\ diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h index 04f03100cb9..e755bc70705 100644 --- a/intern/mantaflow/intern/strings/smoke_script.h +++ b/intern/mantaflow/intern/strings/smoke_script.h @@ -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\ |