[Bf-blender-cvs] [7d4c961ddef] fluid-mantaflow: get wavelet noise params at every frame (animatable)

[Sebastián Barschkis]

Commit: 7d4c961ddefe03257de7cc70d72da1f5095b8bee
Author: Sebastián Barschkis
Date:   Sun Mar 25 14:22:26 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB7d4c961ddefe03257de7cc70d72da1f5095b8bee

get wavelet noise params at every frame (animatable)

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

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 200473b09b8..3b13db9d01a 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -1235,11 +1235,11 @@ int FLUID::bakeDataLow(SmokeModifierData *smd, int framenr)
 
 	// Get variables at every step -> every property is animatable!
 	tmpString += fluid_variables_low;
+	tmpString += fluid_adaptive_time_stepping_low;
 	if (mUsingSmoke)
 		tmpString += smoke_variables_low;
 	if (mUsingLiquid)
 		tmpString += liquid_variables_low;
-	tmpString += fluid_adaptive_time_stepping_low;
 	finalString = parseScript(tmpString, smd);
 	pythonCommands.push_back(finalString);
 	runPythonString(pythonCommands);
@@ -1269,9 +1269,12 @@ int FLUID::bakeDataHigh(SmokeModifierData *smd, int framenr)
 	cacheDirDataHigh[0] = '\0';
 
 	// Get variables at every step -> every property is animatable!
-	if (mUsingHighRes)
-		tmpString += fluid_variables_high;
-		tmpString += fluid_adaptive_time_stepping_high;
+	tmpString += fluid_variables_high;
+	tmpString += fluid_adaptive_time_stepping_high;
+	if (mUsingSmoke)
+		tmpString += smoke_variables_high;
+	if (mUsingLiquid)
+		tmpString += liquid_variables_high;
 	finalString = parseScript(tmpString, smd);
 	pythonCommands.push_back(finalString);
 
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 129d3d26280..60469e04104 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -74,7 +74,11 @@ uv_s$ID$          = [] # list for UV grids\n\
 if upres_xl$ID$ == 1:\n\
     octaves_s$ID$ = int(math.log(upres_xl$ID$+1)/ math.log(2.0) + 0.5)\n\
 elif upres_xl$ID$ > 1:\n\
-    octaves_s$ID$ = int(math.log(upres_xl$ID$)/ math.log(2.0) + 0.5)\n";
+    octaves_s$ID$ = int(math.log(upres_xl$ID$)/ math.log(2.0) + 0.5)\n\
+\n\
+# wavelet noise params\n\
+wltnoise_xl$ID$.posScale = vec3(int(1.0*gs_s$ID$.x)) / $NOISE_POSSCALE$\n\
+wltnoise_xl$ID$.timeAnim = $NOISE_TIMEANIM$\n";
 
 const std::string smoke_with_heat = "\n\
 using_heat_s$ID$ = True\n";
@@ -576,9 +580,7 @@ def smoke_save_data_high_$ID$(path, framenr):\n\
 const std::string smoke_wavelet_turbulence_noise = "\n\
 # wavelet turbulence noise field\n\
 mantaMsg('Smoke wavelet noise')\n\
-wltnoise_xl$ID$ = xl$ID$.create(NoiseField, loadFromFile=True)\n\
-wltnoise_xl$ID$.posScale = vec3(int(1.0*gs_s$ID$.x)) / $NOISE_POSSCALE$\n\
-wltnoise_xl$ID$.timeAnim = $NOISE_TIMEANIM$\n";
+wltnoise_xl$ID$ = xl$ID$.create(NoiseField, loadFromFile=True)\n";
 
 const std::string smoke_inflow_low = "\n\
 def apply_inflow_$ID$():\n\