[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35666] trunk/blender: Changed the particle physics "timetweak" value to a more descriptive " timestep" value, which is in seconds.

[Janne Karhu]

Revision: 35666
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35666
Author:   jhk
Date:     2011-03-21 10:53:29 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
Changed the particle physics "timetweak" value to a more descriptive "timestep" value, which is in seconds.
* Done purely in rna, internally particles still use the timetweak value.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_particle.py
    trunk/blender/source/blender/makesrna/intern/rna_particle.c

Modified: trunk/blender/release/scripts/ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_particle.py	2011-03-21 10:37:19 UTC (rev 35665)
+++ trunk/blender/release/scripts/ui/properties_particle.py	2011-03-21 10:53:29 UTC (rev 35666)
@@ -474,7 +474,7 @@
             col = split.column()
             col.label(text="Integration:")
             col.prop(part, "integrator", text="")
-            col.prop(part, "time_tweak")
+            col.prop(part, "timestep")
             col.prop(part, "subframes")
 
             row = layout.row()

Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c	2011-03-21 10:37:19 UTC (rev 35665)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c	2011-03-21 10:53:29 UTC (rev 35666)
@@ -407,6 +407,20 @@
 	settings->end = value;
 }
 
+static void rna_PartSetings_timestep_set(struct PointerRNA *ptr, float value)
+{
+	ParticleSettings *settings = (ParticleSettings*)ptr->data;
+
+	settings->timetweak = value/0.04f;
+}
+
+static float rna_PartSettings_timestep_get(struct PointerRNA *ptr)
+{
+	ParticleSettings *settings = (ParticleSettings*)ptr->data;
+
+	return settings->timetweak * 0.04f;
+}
+
 static void rna_PartSetting_hairlength_set(struct PointerRNA *ptr, float value)
 {
 	ParticleSettings *settings = (ParticleSettings*)ptr->data;
@@ -1986,6 +2000,13 @@
 	RNA_def_property_ui_range(prop, 0, 10, 1, 3);
 	RNA_def_property_ui_text(prop, "Tweak", "A multiplier for physics timestep (1.0 means one frame = 1/25 seconds)");
 	RNA_def_property_update(prop, 0, "rna_Particle_reset");
+
+	prop= RNA_def_property(srna, "timestep", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_float_funcs(prop, "rna_PartSettings_timestep_get", "rna_PartSetings_timestep_set", NULL);
+	RNA_def_property_range(prop, 0.0001, 100.0);
+	RNA_def_property_ui_range(prop, 0.01, 10, 1, 3);
+	RNA_def_property_ui_text(prop, "Timestep", "The simulation timestep per frame (in seconds)");
+	RNA_def_property_update(prop, 0, "rna_Particle_reset");
 	
 	prop= RNA_def_property(srna, "subframes", PROP_INT, PROP_NONE);
 	RNA_def_property_range(prop, 0, 1000);