[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24170] trunk/blender: * Tiny Force Field Layout improvements and tooltip fix by nudelZ.

[Thomas Dinges]

Revision: 24170
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24170
Author:   dingto
Date:     2009-10-29 23:08:09 +0100 (Thu, 29 Oct 2009)

Log Message:
-----------
* Tiny Force Field Layout improvements and tooltip fix by nudelZ. Thanks! 

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

Modified: trunk/blender/release/scripts/ui/buttons_physics_common.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_physics_common.py	2009-10-29 21:59:31 UTC (rev 24169)
+++ trunk/blender/release/scripts/ui/buttons_physics_common.py	2009-10-29 22:08:09 UTC (rev 24170)
@@ -123,10 +123,16 @@
 	if field.type == 'TURBULENCE':
 		col.itemR(field, "global_coordinates", text="Global")
 	
-	row = layout.row()
-	row.itemL(text="Effect point:")
-	row.itemR(field, "do_location")
-	row.itemR(field, "do_rotation")
+	split = layout.split()
+	
+	col = split.column()
+	col.itemL(text="Effect point:")
+	col.itemR(field, "do_location")
+	col.itemR(field, "do_rotation")
+	
+	sub = split.column()
+	sub.itemL(text="Collision:")
+	sub.itemR(field, "do_absorption")
 		
 		
 def basic_force_field_falloff_ui(self, field):
@@ -140,7 +146,6 @@
 	col.itemR(field, "z_direction", text="")
 	col.itemR(field, "use_min_distance", text="Use Minimum")
 	col.itemR(field, "use_max_distance", text="Use Maximum")
-	col.itemR(field, "do_absorption")
 
 	col = split.column()
 	col.itemR(field, "falloff_power", text="Power")
@@ -151,4 +156,4 @@
 	
 	sub = col.column()
 	sub.active = field.use_max_distance
-	sub.itemR(field, "maximum_distance", text="Distance")
\ No newline at end of file
+	sub.itemR(field, "maximum_distance", text="Distance")

Modified: trunk/blender/release/scripts/ui/buttons_physics_field.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_physics_field.py	2009-10-29 21:59:31 UTC (rev 24169)
+++ trunk/blender/release/scripts/ui/buttons_physics_field.py	2009-10-29 22:08:09 UTC (rev 24170)
@@ -197,4 +197,4 @@
 			col.itemR(settings, "damping", text="Factor", slider=True)
 		
 bpy.types.register(PHYSICS_PT_field)
-bpy.types.register(PHYSICS_PT_collision)
+bpy.types.register(PHYSICS_PT_collision)
\ No newline at end of file

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2009-10-29 21:59:31 UTC (rev 24169)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c	2009-10-29 22:08:09 UTC (rev 24170)
@@ -1056,12 +1056,12 @@
 	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 wind force");
+	RNA_def_property_ui_text(prop, "Noise", "Noise of the force");
 	RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
 
 	prop= RNA_def_property(srna, "seed", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_range(prop, 1, 128);
-	RNA_def_property_ui_text(prop, "Seed", "Seed of the wind noise");
+	RNA_def_property_ui_text(prop, "Seed", "Seed of the noise");
 	RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
 
 	/* Boolean */