Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2020-10-21 11:52:18 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2020-10-21 11:52:30 +0300
commit22ceb4a752e8f29d95793fdc81226f7f2dc0c92e (patch)
tree23628aa9516e5957e5f079bf771ecaae7d0c1a6a /intern/mantaflow
parentfc2a83d95b7b298c9bee58a97f80f803bbaa5ea5 (diff)
Fluid: Fix in addition to new obstacle distance parameter
The obstacle distance value should only be used when using second order boundaries.
Diffstat (limited to 'intern/mantaflow')
-rw-r--r--intern/mantaflow/intern/strings/liquid_script.h3
1 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 683d89a9cfc..7622fc5a602 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -244,7 +244,8 @@ def liquid_step_$ID$():\n\
pp_s$ID$.advectInGrid(flags=flags_s$ID$, vel=vel_s$ID$, integrationMode=IntRK4, deleteInObstacle=deleteInObstacle_s$ID$, stopInObstacle=False, skipNew=True)\n\
\n\
mantaMsg('Pushing particles out of obstacles')\n\
- if using_obstacle_s$ID$:\n\
+ if using_obstacle_s$ID$ and using_fractions_s$ID$ and fracDistance_s$ID$ > 0:\n\
+ # Optional: Increase distance between fluid and obstacles (only obstacles, not borders)\n\
pushOutofObs(parts=pp_s$ID$, flags=flags_s$ID$, phiObs=phiObsIn_s$ID$, thresh=fracDistance_s$ID$)\n\
pushOutofObs(parts=pp_s$ID$, flags=flags_s$ID$, phiObs=phiObs_s$ID$)\n\
\n\