[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34953] trunk/blender: "Fix" for [#26130] Turbulence Force Field seed does not look to generate a new texture when the seed changes via IPO keyframe

[Janne Karhu]

Revision: 34953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34953
Author:   jhk
Date:     2011-02-18 07:42:38 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
"Fix" for [#26130] Turbulence Force Field seed does not look to generate a new texture when the seed changes via IPO keyframe
* Small force field ui changes to make things a bit clearer.

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

Modified: trunk/blender/release/scripts/ui/properties_physics_common.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_common.py	2011-02-18 07:28:10 UTC (rev 34952)
+++ trunk/blender/release/scripts/ui/properties_physics_common.py	2011-02-18 07:42:38 UTC (rev 34953)
@@ -232,8 +232,9 @@
         col.prop(field, "flow")
 
     col = split.column()
-    col.prop(field, "noise")
-    col.prop(field, "seed")
+    sub = col.column(align=True)
+    sub.prop(field, "noise")
+    sub.prop(field, "seed")
     if field.type == 'TURBULENCE':
         col.prop(field, "use_global_coords", text="Global")
     elif field.type == 'HARMONIC':

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2011-02-18 07:28:10 UTC (rev 34952)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2011-02-18 07:42:38 UTC (rev 34953)
@@ -1169,7 +1169,7 @@
 	prop= RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "f_size");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
-	RNA_def_property_ui_text(prop, "Size", "Size of the noise");
+	RNA_def_property_ui_text(prop, "Size", "Size of the turbulence");
 	RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
 
 	prop= RNA_def_property(srna, "rest_length", PROP_FLOAT, PROP_NONE);
@@ -1223,7 +1223,7 @@
 	prop= RNA_def_property(srna, "noise", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "f_noise");
 	RNA_def_property_range(prop, 0.0f, 10.0f);
-	RNA_def_property_ui_text(prop, "Noise", "Noise of the force");
+	RNA_def_property_ui_text(prop, "Noise", "Amount of noise for the force strength");
 	RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
 
 	prop= RNA_def_property(srna, "seed", PROP_INT, PROP_UNSIGNED);