diff options
| -rw-r--r-- | intern/mantaflow/intern/strings/liquid_script.h | 1 | ||||
| -rw-r--r-- | intern/mantaflow/intern/strings/smoke_script.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/fluid.c | 1 |
3 files changed, 2 insertions, 1 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\ diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index cfbbd6ea858..70595bfb1a3 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -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) { |