[Bf-blender-cvs] [8c0776f] fluid-mantaflow: fix for highres smoke flag and some cleanup

Sebastián Barschkis noreply at git.blender.org
Mon Oct 3 19:47:49 CEST 2016


Commit: 8c0776f18b560e18813b1847c8bc7a8b99178095
Author: Sebastián Barschkis
Date:   Thu Sep 15 09:29:32 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB8c0776f18b560e18813b1847c8bc7a8b99178095

fix for highres smoke flag and some cleanup

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

M	intern/mantaflow/intern/FLUID.cpp
M	intern/mantaflow/intern/strings/smoke_script.h

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

diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 533d940..281d504 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -580,7 +580,7 @@ std::string FLUID::getRealValue(const std::string& varName,  SmokeModifierData *
 	else if (varName == "FLAME_SMOKE_COLOR_Z")
 		ss << smd->domain->flame_smoke_color[2];
 	else if (varName == "CURRENT_FRAME")
-		ss << md->scene->r.cfra;
+		ss << md->scene->r.cfra - 1;
 	else if (varName == "PARTICLE_RANDOMNESS")
 		ss << smd->domain->particle_randomness;
 	else if (varName == "PARTICLE_NUMBER")
@@ -747,8 +747,8 @@ void FLUID::exportLiquidScript(SmokeModifierData *smd)
 		+ fluid_solver_low
 		+ fluid_adaptive_time_stepping_low
 		+ liquid_alloc_low
-		+ liquid_init_phi
 		+ liquid_bounds_low
+		+ liquid_init_phi
 		+ liquid_variables_low;
 
 	if (highres) {
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index d653a0a..2a1ed56 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -198,7 +198,7 @@ def manta_step(start_frame):\n\
         if using_fire:\n\
             update_flame_low()\n\
         \n\
-        if using_wavelets:\n\
+        if using_highres:\n\
             xl.timestep = s.timestep\n\
             mantaMsg('High step / s.frame: ' + str(s.frame))\n\
             if using_fire:\n\




More information about the Bf-blender-cvs mailing list