[Bf-blender-cvs] [e9629e3cfda] master: Fluid: Use different phi for levelset generation

[Sebastián Barschkis]

Commit: e9629e3cfdaf995bd76249595c5c2b7d81432e76
Author: Sebastián Barschkis
Date:   Mon Mar 23 23:44:37 2020 +0100
Branches: master
https://developer.blender.org/rBe9629e3cfdaf995bd76249595c5c2b7d81432e76

Fluid: Use different phi for levelset generation

Phi that is used for mesh should be the one that matches particles best.

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

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 2376d49aace..297c2a8ed6b 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -310,11 +310,11 @@ def liquid_step_mesh_$ID$():\n\
     \n\
     # no upres: just use the loaded grids\n\
     if upres_sm$ID$ <= 1:\n\
-        phi_sm$ID$.copyFrom(phiTmp_s$ID$)\n\
+        phi_sm$ID$.copyFrom(phi_s$ID$)\n\
     \n\
     # with upres: recreate grids\n\
     else:\n\
-        interpolateGrid(target=phi_sm$ID$, source=phiTmp_s$ID$)\n\
+        interpolateGrid(target=phi_sm$ID$, source=phi_s$ID$)\n\
     \n\
     # create surface\n\
     pp_sm$ID$.readParticles(pp_s$ID$)\n\