UI / Modifiers:
authorThomas Dinges <blender@dingto.org>
Sat, 8 Jun 2013 16:06:39 +0000 (16:06 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 8 Jun 2013 16:06:39 +0000 (16:06 +0000)
* VERTEX_WEIGHT modifiers had quite a messy UI, improved the grouping of options a bit, so it is easier to scan through.
* Do not use abbreviations like "Rem" or "Dist" in the UI...

* Also small change for BEVEL modifier UI for more efficient space usage.

release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesrna/intern/rna_modifier.c

index 43c5eba1bb14e58a483b32f4e7a048e70bb18a6c..a0db9969f3c749cd3f1273e1d2d87c042939c49f 100644 (file)
@@ -119,12 +119,15 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         layout.prop(md, "end_cap")
 
     def BEVEL(self, layout, ob, md):
-        layout.prop(md, "width")
-        layout.prop(md, "segments")
-
         split = layout.split()
-        split.prop(md, "use_only_vertices")
-        split.prop(md, "use_clamp_overlap")
+        
+        col = split.column()
+        col.prop(md, "width")
+        col.prop(md, "segments")
+
+        col = split.column()
+        col.prop(md, "use_only_vertices")
+        col.prop(md, "use_clamp_overlap")
 
         layout.label(text="Limit Method:")
         layout.row().prop(md, "limit_method", expand=True)
@@ -979,30 +982,31 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
 
     def VERTEX_WEIGHT_EDIT(self, layout, ob, md):
         split = layout.split()
+        
         col = split.column()
         col.label(text="Vertex Group:")
         col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
 
-        col = split.column()
         col.label(text="Default Weight:")
         col.prop(md, "default_weight", text="")
+        
+        col = split.column()
+        col.prop(md, "use_add")
+        sub = col.column()
+        sub.active = md.use_add
+        sub.prop(md, "add_threshold")
+        
+        col = col.column()
+        col.prop(md, "use_remove")
+        sub = col.column()
+        sub.active = md.use_remove
+        sub.prop(md, "remove_threshold")
+        
+        layout.separator()
 
         layout.prop(md, "falloff_type")
         if md.falloff_type == 'CURVE':
-            col = layout.column()
-            col.template_curve_mapping(md, "map_curve")
-
-        split = layout.split(percentage=0.4)
-        split.prop(md, "use_add")
-        row = split.row()
-        row.active = md.use_add
-        row.prop(md, "add_threshold")
-
-        split = layout.split(percentage=0.4)
-        split.prop(md, "use_remove")
-        row = split.row()
-        row.active = md.use_remove
-        row.prop(md, "remove_threshold")
+            layout.template_curve_mapping(md, "map_curve")
 
         # Common mask options
         layout.separator()
@@ -1043,15 +1047,21 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col = split.column()
         col.label(text="Target Object:")
         col.prop(md, "target", text="")
-
-        layout.row().prop(md, "proximity_mode", expand=True)
+        
+        split = layout.split()
+        
+        col = split.column()
+        col.label(text="Distance:")
+        col.prop(md, "proximity_mode", text="")
         if md.proximity_mode == 'GEOMETRY':
-            layout.row().prop(md, "proximity_geometry")
-
-        row = layout.row()
-        row.prop(md, "min_dist")
-        row.prop(md, "max_dist")
-
+            col.row().prop(md, "proximity_geometry")
+            
+        col = split.column()
+        col.label()
+        col.prop(md, "min_dist")
+        col.prop(md, "max_dist")
+        
+        layout.separator()
         layout.prop(md, "falloff_type")
 
         # Common mask options
index 0b7d6823b8f04e7410e2030d7aee452b178e7548..ed85312948d31e66d0ddfcb7130d04f36ec75687 100644 (file)
@@ -3042,7 +3042,7 @@ static void rna_def_modifier_weightvgedit(BlenderRNA *brna)
        RNA_def_property_float_sdna(prop, NULL, "rem_threshold");
        RNA_def_property_range(prop, 0.0, 1.0);
        RNA_def_property_ui_range(prop, 0.0, 1.0, 1, -1);
-       RNA_def_property_ui_text(prop, "Rem Threshold", "Upper bound for a vertex's weight "
+       RNA_def_property_ui_text(prop, "Remove Threshold", "Upper bound for a vertex's weight "
                                 "to be removed from the vgroup");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
@@ -3126,18 +3126,18 @@ static void rna_def_modifier_weightvgmix(BlenderRNA *brna)
 static void rna_def_modifier_weightvgproximity(BlenderRNA *brna)
 {
        static EnumPropertyItem weightvg_proximity_modes_items[] = {
-               {MOD_WVG_PROXIMITY_OBJECT, "OBJECT", 0, "Object Distance",
+               {MOD_WVG_PROXIMITY_OBJECT, "OBJECT", 0, "Object",
                                           "Use distance between affected and target objects"},
-               {MOD_WVG_PROXIMITY_GEOMETRY, "GEOMETRY", 0, "Geometry Distance",
+               {MOD_WVG_PROXIMITY_GEOMETRY, "GEOMETRY", 0, "Geometry",
                                             "Use distance between affected object's vertices and target "
                                             "object, or target object's geometry"},
                {0, NULL, 0, NULL, NULL}
        };
 
        static EnumPropertyItem proximity_geometry_items[] = {
-               {MOD_WVG_PROXIMITY_GEOM_VERTS, "VERTEX", ICON_VERTEXSEL, "Vertex", "Compute distance to nearest vertex"},
-               {MOD_WVG_PROXIMITY_GEOM_EDGES, "EDGE", ICON_EDGESEL, "Edge", "Compute distance to nearest edge"},
-               {MOD_WVG_PROXIMITY_GEOM_FACES, "FACE", ICON_FACESEL, "Face", "Compute distance to nearest face"},
+               {MOD_WVG_PROXIMITY_GEOM_VERTS, "VERTEX", 0, "Vertex", "Compute distance to nearest vertex"},
+               {MOD_WVG_PROXIMITY_GEOM_EDGES, "EDGE", 0, "Edge", "Compute distance to nearest edge"},
+               {MOD_WVG_PROXIMITY_GEOM_FACES, "FACE", 0, "Face", "Compute distance to nearest face"},
                {0, NULL, 0, NULL, NULL}
        };
 
@@ -3195,13 +3195,13 @@ static void rna_def_modifier_weightvgproximity(BlenderRNA *brna)
        prop = RNA_def_property(srna, "min_dist", PROP_FLOAT, PROP_DISTANCE);
        RNA_def_property_range(prop, 0.0, FLT_MAX);
        RNA_def_property_ui_range(prop, 0.0, 1000.0, 10, -1);
-       RNA_def_property_ui_text(prop, "Lowest Dist", "Distance mapping to weight 0.0");
+       RNA_def_property_ui_text(prop, "Lowest", "Distance mapping to weight 0.0");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "max_dist", PROP_FLOAT, PROP_DISTANCE);
        RNA_def_property_range(prop, 0.0, FLT_MAX);
        RNA_def_property_ui_range(prop, 0.0, 1000.0, 10, -1);
-       RNA_def_property_ui_text(prop, "Highest Dist", "Distance mapping to weight 1.0");
+       RNA_def_property_ui_text(prop, "Highest", "Distance mapping to weight 1.0");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
        prop = RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE);