[Bf-blender-cvs] [f1fbad8] fluid-mantaflow: clean up wavelet noise

[Sebastián Barschkis]

Commit: f1fbad849f48535b6b85715b34d6214be201d230
Author: Sebastián Barschkis
Date:   Fri Feb 26 09:21:53 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBf1fbad849f48535b6b85715b34d6214be201d230

clean up wavelet noise

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

M	intern/smoke/intern/MANTA.cpp
M	intern/smoke/intern/scenarios/smoke.h

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index 9d25161..f8258d5 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -47,16 +47,6 @@ std::string Manta_API::get_real_value( const std::string& varName, SmokeModifier
 		else { 		ss << smd->domain->fluid->_zRes;}
 	else if (varName == "SOLVER_DIM")
 		ss <<  smd->domain->manta_solver_res;
-	else if (varName == "USE_NOISE_CLAMP")
-		ss << ((smd->domain->flags & MOD_SMOKE_NOISE_CLAMP) ? "True" : "False");
-	else if (varName == "NOISE_CN")
-		ss << smd->domain->noise_clamp_neg;
-	else if (varName == "NOISE_CP")
-		ss << smd->domain->noise_clamp_pos;
-	else if (varName == "NOISE_VALSCALE")
-		ss << smd->domain->noise_val_scale;
-	else if (varName == "NOISE_VALOFFSET")
-		ss << smd->domain->noise_val_offset;
 	else if (varName == "NOISE_TIMEANIM")
 		ss << smd->domain->noise_time_anim;
 	else if (varName == "HRESX")
diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 9492547..76ae6d9 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -135,11 +135,6 @@ const string wavelet_turbulence_noise = "\n\
 # wavelet turbulence noise field\n\
 xl_wltnoise = s.create(NoiseField, loadFromFile=True)\n\
 xl_wltnoise.posScale = vec3(int(1.0*gs.x)) * 0.5\n\
-xl_wltnoise.clamp = $USE_NOISE_CLAMP$\n\
-xl_wltnoise.clampNeg = $NOISE_CN$\n\
-xl_wltnoise.clampPos = $NOISE_CP$\n\
-xl_wltnoise.valScale = $NOISE_VALSCALE$\n\
-xl_wltnoise.valOffset = $NOISE_VALOFFSET$\n\
 xl_wltnoise.timeAnim = $NOISE_TIMEANIM$\n\
 if(upres>0):\n\
   xl_wltnoise.posScale = xl_wltnoise.posScale * (1./upres)\n\