[Bf-blender-cvs] [67bbd8b] fluid-mantaflow: cleaned up a bit in mantaflow scripts

Sebastián Barschkis noreply at git.blender.org
Fri Aug 19 18:56:11 CEST 2016


Commit: 67bbd8b3db0a3eeda3799e4e10a97e7097857f04
Author: Sebastián Barschkis
Date:   Thu Aug 18 23:12:31 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB67bbd8b3db0a3eeda3799e4e10a97e7097857f04

cleaned up a bit in mantaflow scripts

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

M	intern/mantaflow/intern/strings/shared_script.h
M	intern/mantaflow/intern/strings/smoke_script.h

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

diff --git a/intern/mantaflow/intern/strings/shared_script.h b/intern/mantaflow/intern/strings/shared_script.h
index d7ad241..1473b02 100644
--- a/intern/mantaflow/intern/strings/shared_script.h
+++ b/intern/mantaflow/intern/strings/shared_script.h
@@ -97,11 +97,9 @@ xl.cfl         = s.cfl\n";
 
 const std::string fluid_delete_variables_low = "\n\
 if 'dim'             in globals() : del dim\n\
-if 'res'             in globals() : del gravity\n\
-if 'gravity'         in globals() : del gravity\n\
+if 'res'             in globals() : del res\n\
 if 'gs'              in globals() : del gs\n\
 if 'gravity'         in globals() : del gravity\n\
-if 'gs'              in globals() : del gs\n\
 if 'doOpen'          in globals() : del doOpen\n\
 if 'boundConditions' in globals() : del boundConditions\n\
 if 'boundaryWidth'   in globals() : del boundaryWidth\n\
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 9680d5c..59df170 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -210,7 +210,7 @@ def manta_step(start_frame):\n\
 
 const std::string smoke_step_low = "\n\
 def step_low():\n\
-    mantaMsg('Step low')\n\
+    mantaMsg('Smoke step low')\n\
     copyRealToVec3(sourceX=x_vel, sourceY=y_vel, sourceZ=z_vel, target=vel)\n\
     copyRealToVec3(sourceX=x_obvel, sourceY=y_obvel, sourceZ=z_obvel, target=obvel)\n\
     if dim == 2:\n\
@@ -279,7 +279,7 @@ def update_flame_low():\n\
 
 const std::string smoke_step_high = "\n\
 def step_high():\n\
-    mantaMsg('Step high')\n\
+    mantaMsg('Smoke step high')\n\
     copyRealToVec3(sourceX=texture_u, sourceY=texture_v, sourceZ=texture_w, target=uv[0])\n\
     copyRealToVec3(sourceX=texture_u2, sourceY=texture_v2, sourceZ=texture_w2, target=uv[1])\n\
     \n\




More information about the Bf-blender-cvs mailing list