diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:38:12 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:38:12 +0300 |
| commit | c3001812dc0253624c03236e75da229418a8c4ad (patch) | |
| tree | 5aa4a526b0b147beb9d668c736b842313a88f367 /intern | |
| parent | 3984586292855bb6710facf5845b44f5d11dcc6f (diff) | |
| parent | 33317b4647771e2031722531c6f9e6b124255a74 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/mantaflow/intern/strings/liquid_script.h | 3 | ||||
| -rw-r--r-- | intern/mantaflow/intern/strings/smoke_script.h | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h index 6cbbf06f0d2..bb42b781c19 100644 --- a/intern/mantaflow/intern/strings/liquid_script.h +++ b/intern/mantaflow/intern/strings/liquid_script.h @@ -175,9 +175,6 @@ def liquid_adaptive_step_$ID$(framenr):\n\ extrapolateLsSimple(phi=phiObs_s$ID$, distance=int(res_s$ID$/2), inside=True)\n\ extrapolateLsSimple(phi=phiObs_s$ID$, distance=int(res_s$ID$/2), inside=False)\n\ \n\ - mantaMsg('Initializing fluid levelset')\n\ - extrapolateLsSimple(phi=phiIn_s$ID$, distance=int(res_s$ID$/2), inside=True)\n\ - extrapolateLsSimple(phi=phiIn_s$ID$, distance=int(res_s$ID$/2), inside=False)\n\ phi_s$ID$.join(phiIn_s$ID$)\n\ \n\ if using_obstacle_s$ID$:\n\ diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h index 9277923fa7a..ad966503fd1 100644 --- a/intern/mantaflow/intern/strings/smoke_script.h +++ b/intern/mantaflow/intern/strings/smoke_script.h @@ -288,10 +288,6 @@ def smoke_adaptive_step_$ID$(framenr):\n\ extrapolateLsSimple(phi=phiObs_s$ID$, distance=int(res_s$ID$/2), inside=True)\n\ extrapolateLsSimple(phi=phiObs_s$ID$, distance=int(res_s$ID$/2), inside=False)\n\ \n\ - mantaMsg('Initializing fluid levelset')\n\ - extrapolateLsSimple(phi=phiIn_s$ID$, distance=int(res_s$ID$/2), inside=True)\n\ - extrapolateLsSimple(phi=phiIn_s$ID$, distance=int(res_s$ID$/2), inside=False)\n\ - \n\ if using_outflow_s$ID$:\n\ phiOut_s$ID$.join(phiOutIn_s$ID$)\n\ \n\ |