[Bf-blender-cvs] [5cf66890197] master: Fluid: Removed obstacle levelset optimization

[Sebastián Barschkis]

Commit: 5cf66890197211b2a64cb30fc6ba746360e02ae0
Author: Sebastián Barschkis
Date:   Fri Mar 27 00:16:05 2020 +0100
Branches: master
https://developer.blender.org/rB5cf66890197211b2a64cb30fc6ba746360e02ae0

Fluid: Removed obstacle levelset optimization

Currently results in unstable particle behavior and incorrect meshing.

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

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 e9222fc7d93..b0bf6f85914 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -190,9 +190,6 @@ def liquid_adaptive_step_$ID$(framenr):\n\
     extrapolateLsSimple(phi=phiIn_s$ID$, distance=3)\n\
     phi_s$ID$.join(phiIn_s$ID$)\n\
     \n\
-    if using_obstacle_s$ID$:\n\
-        phi_s$ID$.subtract(o=phiObsIn_s$ID$, flags=flags_s$ID$, subtractType=FlagObstacle)\n\
-    \n\
     if using_outflow_s$ID$:\n\
         phiOut_s$ID$.join(phiOutIn_s$ID$)\n\
     \n\
@@ -200,6 +197,10 @@ def liquid_adaptive_step_$ID$(framenr):\n\
         updateFractions(flags=flags_s$ID$, phiObs=phiObs_s$ID$, fractions=fractions_s$ID$, boundaryWidth=boundaryWidth_s$ID$, fracThreshold=fracThreshold_s$ID$)\n\
     setObstacleFlags(flags=flags_s$ID$, phiObs=phiObs_s$ID$, phiOut=phiOut_s$ID$, fractions=fractions_s$ID$, phiIn=phiIn_s$ID$)\n\
     \n\
+    if using_obstacle_s$ID$:\n\
+        # TODO (sebbas): Enable flags check again, currently produces unstable particle behavior\n\
+        phi_s$ID$.subtract(o=phiObsIn_s$ID$) #, flags=flags_s$ID$, subtractType=FlagObstacle)\n\
+    \n\
     # add initial velocity: set invel as source grid to ensure const vels in inflow region, sampling makes use of this\n\
     if using_invel_s$ID$:\n\
         extrapolateVec3Simple(vel=invelC_s$ID$, phi=phiIn_s$ID$, distance=6, inside=True)\n\