[Bf-blender-cvs] [cbf0a28] fluid-mantaflow: adapted value ranges for some fields and removed vorticity guard in smoke script

[Sebastián Barschkis]

Commit: cbf0a28f87e7dffc58654dd4e5e30fe366f1a204
Author: Sebastián Barschkis
Date:   Tue Aug 23 00:31:37 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBcbf0a28f87e7dffc58654dd4e5e30fe366f1a204

adapted value ranges for some fields and removed vorticity guard in smoke script

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

M	intern/mantaflow/intern/strings/smoke_script.h
M	source/blender/makesrna/intern/rna_smoke.c

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

diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 59df170..0fb19e6 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -241,8 +241,7 @@ def step_low():\n\
         resetOutflow(flags=flags, real=density)\n\
     \n\
     mantaMsg('Vorticity')\n\
-    if vorticity > 0.01:\n\
-        vorticityConfinement(vel=vel, flags=flags, strength=$VORTICITY$)\n\
+    vorticityConfinement(vel=vel, flags=flags, strength=$VORTICITY$)\n\
     \n\
     if using_heat:\n\
         mantaMsg('Adding heat buoyancy')\n\
diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c
index 28c90b2..17edbb5 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -660,8 +660,8 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "time_scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "time_scale");
-	RNA_def_property_range(prop, 0.2, 1.5);
-	RNA_def_property_ui_range(prop, 0.2, 1.5, 0.02, 5);
+	RNA_def_property_range(prop, 0.0001, 10.0);
+	RNA_def_property_ui_range(prop, 0.0001, 10.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Time Scale", "Adjust simulation speed");
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
 
@@ -802,26 +802,26 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 
 	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.1, 10.0);
-	RNA_def_property_ui_range(prop, 0.1, 2.0, 1, 2);
+	RNA_def_property_range(prop, 0.0001, 10.0);
+	RNA_def_property_ui_range(prop, 0.0001, 10.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Scale", "Scale of noise (higher value results in larger vortices)");
 	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.1, 10.0);
-	RNA_def_property_ui_range(prop, 0.1, 2.0, 1, 2);
+	RNA_def_property_range(prop, 0.0001, 10.0);
+	RNA_def_property_ui_range(prop, 0.0001, 10.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Time", "Animation time of noise");
 	
 	prop = RNA_def_property(srna, "particle_randomness", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_range(prop, 0.0, 2.0);
-	RNA_def_property_ui_range(prop, 0.01, 2.0, 1.0, 5);
+	RNA_def_property_range(prop, 0.0, 10.0);
+	RNA_def_property_ui_range(prop, 0.0, 10.0, 0.02, 5);
 	RNA_def_property_ui_text(prop, "Randomness", "Randomness factor for particle sampling");
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");
 	
 	prop = RNA_def_property(srna, "particle_number", PROP_INT, PROP_NONE);
-	RNA_def_property_range(prop, 1, 3);
-	RNA_def_property_ui_range(prop, 1, 3, 2, -1);
+	RNA_def_property_range(prop, 1, 5);
+	RNA_def_property_ui_range(prop, 1, 5, 2, -1);
 	RNA_def_property_ui_text(prop, "Discretization", "Particle number factor (higher value results in more particles)");
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Smoke_resetCache");