[Bf-blender-cvs] [4ccbbd30806] master: Fix T74446: Liquid Inflow Does Not Work

Sebastián Barschkis noreply at git.blender.org
Thu Mar 5 11:41:22 CET 2020


Commit: 4ccbbd308060f0330472828b317c59e054c9ee7b
Author: Sebastián Barschkis
Date:   Thu Mar 5 11:40:59 2020 +0100
Branches: master
https://developer.blender.org/rB4ccbbd308060f0330472828b317c59e054c9ee7b

Fix T74446: Liquid Inflow Does Not Work

Somehow this was forgotton in the optimization patch a5c4a44df67e.

===================================================================

M	intern/mantaflow/intern/strings/liquid_script.h
M	intern/mantaflow/intern/strings/smoke_script.h
M	source/blender/blenkernel/intern/fluid.c

===================================================================

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) {



More information about the Bf-blender-cvs mailing list