[Bf-blender-cvs] [e42f589a92e] fluid-mantaflow: use improved particle levelset function

[Sebastián Barschkis]

Commit: e42f589a92ed65b37b70dca793e007885bba9e00
Author: Sebastián Barschkis
Date:   Mon Apr 30 16:48:26 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBe42f589a92ed65b37b70dca793e007885bba9e00

use improved particle levelset function

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

M	intern/mantaflow/intern/strings/liquid_script.h
M	release/scripts/startup/bl_ui/properties_physics_smoke.py

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

diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index 86b746e584a..80d4178c6f7 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -352,7 +352,8 @@ def liquid_save_mesh_$ID$(path, framenr):\n\
     # create surface\n\
     pp_xl$ID$.readParticles(pp_s$ID$)\n\
     gridParticleIndex(parts=pp_xl$ID$, flags=flags_xl$ID$, indexSys=pindex_xl$ID$, index=gpi_xl$ID$)\n\
-    averagedParticleLevelset(pp_xl$ID$, pindex_xl$ID$, flags_xl$ID$, gpi_xl$ID$, phiParts_xl$ID$, radiusFactor_s$ID$, 1, 1)\n\
+    improvedParticleLevelset(pp_xl$ID$, pindex_xl$ID$, flags_xl$ID$, gpi_xl$ID$, phiParts_xl$ID$, radiusFactor_s$ID$, 1, 1, smoothenLower_s$ID$, smoothenUpper_s$ID$)\n\
+#    averagedParticleLevelset(pp_xl$ID$, pindex_xl$ID$, flags_xl$ID$, gpi_xl$ID$, phiParts_xl$ID$, radiusFactor_s$ID$, 1, 1)\n\
 #    unionParticleLevelset(pp_xl$ID$, pindex_xl$ID$, flags_xl$ID$, gpi_xl$ID$, phiParts_xl$ID$, radiusFactor_s$ID$)\n\
     \n\
     phi_xl$ID$.addConst(1.) # shrink slightly\n\
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index ce17731db00..e5f35bb1903 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -138,6 +138,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel):
                 col.label(text="Liquid:")
                 col.prop(domain, "particle_randomness")
                 col.prop(domain, "particle_minimum")
+                col.prop(domain, "use_flip_particles", text="Show FLIP")
 
                 col = split.column(align=True)
                 col.label()
@@ -478,8 +479,6 @@ class PHYSICS_PT_smoke_particles(PhysicButtonsPanel, Panel):
         sub2.prop(domain, "particle_tracer_amount", text="Amount")
         sub2.prop(domain, "particle_tracer_life", text="Life")
         sub2.prop(domain, "particle_tracer_max", text="Maximum")
-        sub3 = col.column()
-        sub3.prop(domain, "use_flip_particles", text="FLIP")
 
         split = layout.split()
         split.enabled = domain.cache_baked_data and not domain.cache_baking_particles and (domain.use_drop_particles or domain.use_bubble_particles or domain.use_floater_particles or domain.use_tracer_particles)