[Bf-blender-cvs] [22ceb4a752e] master: Fluid: Fix in addition to new obstacle distance parameter

[Sebastián Barschkis]

Commit: 22ceb4a752e8f29d95793fdc81226f7f2dc0c92e
Author: Sebastián Barschkis
Date:   Wed Oct 21 10:52:18 2020 +0200
Branches: master
https://developer.blender.org/rB22ceb4a752e8f29d95793fdc81226f7f2dc0c92e

Fluid: Fix in addition to new obstacle distance parameter

The obstacle distance value should only be used when using second order boundaries.

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

M	intern/mantaflow/intern/strings/liquid_script.h

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

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\