[Bf-blender-cvs] [db733cb] fluid-mantaflow: even more cleanup

[Sebastián Barschkis]

Commit: db733cb2c088942050823ca129f2eee7369aeee9
Author: Sebastián Barschkis
Date:   Fri Feb 26 12:59:04 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBdb733cb2c088942050823ca129f2eee7369aeee9

even more cleanup

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

M	intern/smoke/intern/FLUID_3D.cpp
M	intern/smoke/intern/WTURBULENCE.cpp
M	intern/smoke/intern/scenarios/smoke.h
M	source/blender/makesrna/intern/rna_smoke.c

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

diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index 824d42e..61c50b5 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -608,7 +608,6 @@ _xRes(res[0]), _yRes(res[1]), _zRes(res[2]), _res(0.0f)
 		solver_setup_low +
 		uv_setup +
 		alloc_base_grids_low +
-		//noise_low +
 		prep_domain_low +
 		flags +
 		manta_step +
diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp
index 89696bb..2c5ef1b 100644
--- a/intern/smoke/intern/WTURBULENCE.cpp
+++ b/intern/smoke/intern/WTURBULENCE.cpp
@@ -1259,7 +1259,6 @@ WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int no
 	std::string setup_script =
 		solver_setup_high +
 		alloc_base_grids_high +
-		//noise_high +
 		prep_domain_high +
 		flags +
 		wavelet_turbulence_noise +
diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 12415fd..4299cb7 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -68,17 +68,6 @@ forces = s.create(MACGrid)\n\
 inflow_grid = s.create(LevelsetGrid)\n\
 fuel_inflow = s.create(LevelsetGrid)\n";
 
-const string noise_low = "\n\
-# noise field low\n\
-noise = s.create(NoiseField, loadFromFile=True)\n\
-noise.posScale = vec3(45)\n\
-noise.clamp = $USE_NOISE_CLAMP$\n\
-noise.clampNeg = $NOISE_CN$\n\
-noise.clampPos = $NOISE_CP$\n\
-noise.valScale = $NOISE_VALSCALE$\n\
-noise.valOffset = $NOISE_VALOFFSET$\n\
-noise.timeAnim = $NOISE_TIMEANIM$\n";
-
 const string prep_domain_low = "\n\
 # prepare domain low\n\
 flags.initDomain(boundaryWidth=boundaryWidth)\n\
@@ -113,17 +102,6 @@ xl_z_vel = s.create(RealGrid)\n\
 xl_density = xl.create(RealGrid)\n\
 xl_weight  = xl.create(RealGrid)\n";
 
-const string noise_high = "\n\
-# noise field high\n\
-xl_noise = xl.create(NoiseField, fixedSeed=256, loadFromFile=True)\n\
-xl_noise.posScale = vec3(20)\n\
-xl_noise.clamp = $USE_NOISE_CLAMP$\n\
-xl_noise.clampNeg = $NOISE_CN$\n\
-xl_noise.clampPos = $NOISE_CP$\n\
-xl_noise.valScale = $NOISE_VALSCALE$\n\
-xl_noise.valOffset = $NOISE_VALOFFSET$\n\
-xl_noise.timeAnim = $NOISE_TIMEANIM$ * upres\n";
-
 const string prep_domain_high = "\n\
 # prepare domain high\n\
 xl_flags.initDomain(boundaryWidth=boundaryWidth)\n\
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index f7c83ca..c0cd79a 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -630,27 +630,20 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 	
 	prop = RNA_def_property(srna, "manta_filepath", PROP_STRING, PROP_FILEPATH);
 	RNA_def_property_string_sdna(prop, NULL, "_manta_filepath");
-	RNA_def_property_ui_text(prop, "Output Path", "Directory to save Mantaflow scene script");
+	RNA_def_property_ui_text(prop, "Output Path", "Directory/name to save Mantaflow scene script");
 //	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_manta_write_settings");
-	
-	prop = RNA_def_property(srna, "manta_uvs", PROP_INT, PROP_NONE);
-	RNA_def_property_int_sdna(prop, NULL, "manta_uvs_num");
-	RNA_def_property_range(prop, 0, 4);
-	RNA_def_property_ui_range(prop, 0, 4, 1, -1);
-	RNA_def_property_ui_text(prop, "UVs number", "Number of UV coordinate grids to use (Better not more than 2)");
-	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
 
 	prop = RNA_def_property(srna, "noise_pos_scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "noise_pos_scale");
 	RNA_def_property_range(prop, 0.0, 2.0);
-	RNA_def_property_ui_range(prop, 0.0, 1.0, 1.0, 5);
+	RNA_def_property_ui_range(prop, 0.0, 2.0, 1, 2);
 	RNA_def_property_ui_text(prop, "Scale", "Scale of noise");
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
 	
 	prop = RNA_def_property(srna, "noise_time_anim", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "noise_time_anim");
 	RNA_def_property_range(prop, 0.0, 2.0);
-	RNA_def_property_ui_range(prop, 0.0, 1.0, 1.0, 5);
+	RNA_def_property_ui_range(prop, 0.0, 2.0, 1, 2);
 	RNA_def_property_ui_text(prop, "Time", "Animation time of noise");
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
 }