[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21565] branches/blender2.5/blender: Fix cloth UI + tooltips - patch provided by nudelZ

[Daniel Genrich]

Revision: 21565
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21565
Author:   genscher
Date:     2009-07-14 00:35:04 +0200 (Tue, 14 Jul 2009)

Log Message:
-----------
Fix cloth UI + tooltips - patch provided by nudelZ

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_physic_cloth.py
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c

Modified: branches/blender2.5/blender/release/ui/buttons_physic_cloth.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physic_cloth.py	2009-07-13 19:33:59 UTC (rev 21564)
+++ branches/blender2.5/blender/release/ui/buttons_physic_cloth.py	2009-07-13 22:35:04 UTC (rev 21565)
@@ -40,19 +40,23 @@
 
 			split = layout.split()
 			
-			col = split.column()
+			col = split.column(align=True)
 			col.itemR(cloth, "quality", slider=True)
 			col.itemR(cloth, "gravity")
 
-			subcol = col.column(align=True)
-			subcol.itemR(cloth, "mass")
-			subcol.item_pointerR(cloth, "mass_vertex_group", ob, "vertex_groups", text="")
-
-			col = split.column()
-			col.itemL(text="Stiffness:")
+			col.itemR(cloth, "pin_cloth", text="Pin")
+			col = col.column(align=True)
+			col.active = cloth.pin_cloth
+			col.itemR(cloth, "pin_stiffness", text="Stiffness")
+			col.item_pointerR(cloth, "mass_vertex_group", ob, "vertex_groups", text="")
+			
+			col = split.column(align=True)
+			col.itemL(text="Presets...")
+			col.itemL(text="")
+			col.itemR(cloth, "mass")
 			col.itemR(cloth, "structural_stiffness", text="Structural")
 			col.itemR(cloth, "bending_stiffness", text="Bending")
-			col.itemL(text="Damping:")
+			col.itemL(text="Damping")
 			col.itemR(cloth, "spring_damping", text="Spring")
 			col.itemR(cloth, "air_damping", text="Air")
 			
@@ -185,4 +189,3 @@
 bpy.types.register(PHYSICS_PT_cloth_cache)
 bpy.types.register(PHYSICS_PT_cloth_collision)
 bpy.types.register(PHYSICS_PT_cloth_stiffness)
-

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c	2009-07-13 19:33:59 UTC (rev 21564)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c	2009-07-13 22:35:04 UTC (rev 21565)
@@ -215,7 +215,7 @@
 
 	prop= RNA_def_property(srna, "mass_vertex_group", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_funcs(prop, "rna_ClothSettings_mass_vgroup_get", "rna_ClothSettings_mass_vgroup_length", "rna_ClothSettings_mass_vgroup_set");
-	RNA_def_property_ui_text(prop, "Mass Vertex Group", "Vertex group for fine control over mass distribution.");
+	RNA_def_property_ui_text(prop, "Mass Vertex Group", "Vertex Group for pinning of vertices.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
 	
 	prop= RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_VECTOR);
@@ -235,7 +235,7 @@
 
 	prop= RNA_def_property(srna, "pin_cloth", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flags", CLOTH_SIMSETTINGS_FLAG_GOAL);
-	RNA_def_property_ui_text(prop, "Pin Cloth", "Define forces for vertices to stick to animated position.");
+	RNA_def_property_ui_text(prop, "Pin Cloth", "Enable pinning of cloth vertices to other objects/positions.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "pin_stiffness", PROP_FLOAT, PROP_NONE);
@@ -363,18 +363,18 @@
 	prop= RNA_def_property(srna, "min_distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "epsilon");
 	RNA_def_property_range(prop, 0.001f, 1.0f);
-	RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance between collision objects before collision response takes in, can be changed for each frame.");
+	RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance between collision objects before collision response takes in");
 	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "friction", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_range(prop, 0.0f, 80.0f);
-	RNA_def_property_ui_text(prop, "Friction", "Friction force if a collision happened (0=movement not changed, 100=no movement left)");
+	RNA_def_property_ui_text(prop, "Friction", "Friction force if a collision happened (higher = less movement).");
 	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
 
 	prop= RNA_def_property(srna, "collision_quality", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "loop_count");
 	RNA_def_property_range(prop, 1, 20);
-	RNA_def_property_ui_text(prop, "Collision Quality", "How many collision iterations should be done. (higher is better quality but slower)");
+	RNA_def_property_ui_text(prop, "Collision Quality", "How many collision iterations should be done (higher is better quality but slower).");
 	RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA, "rna_cloth_update");
 
 	/* self collision */