Revision: 22023
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22023
Author: dingto
Date: 2009-07-29 20:44:54 +0200 (Wed, 29 Jul 2009)
Log Message:
-----------
2.5 MetaBalls:
* Layout tweaks by nudelZ. Thanks!
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_metaball.py
branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
Modified: branches/blender2.5/blender/release/ui/buttons_data_metaball.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_metaball.py
2009-07-29 18:15:46 UTC (rev 22022)
+++ branches/blender2.5/blender/release/ui/buttons_data_metaball.py
2009-07-29 18:44:54 UTC (rev 22023)
@@ -35,17 +35,21 @@
mball = context.meta_ball
- col = layout.column()
+ split = layout.split()
+ col = split.column()
+ col.itemL(text="Resolution:")
+ sub = col.column(align=True)
+ sub.itemR(mball, "wire_size", text="View")
+ sub.itemR(mball, "render_size", text="Render")
+
+ col = split.column()
col.itemL(text="Settings:")
col.itemR(mball, "threshold", text="Threshold")
- col.itemL(text="Resolution:")
- col = layout.column(align=True)
- col.itemR(mball, "wire_size", text="View")
- col.itemR(mball, "render_size", text="Render")
-
- layout.itemR(mball, "flag")
+ layout.itemL(text="Update:")
+ layout.itemR(mball, "flag", expand=True)
+
class DATA_PT_metaball_element(DataButtonsPanel):
__label__ = "Meta Element"
@@ -57,14 +61,22 @@
metaelem = context.meta_ball.last_selected_element
- col = layout.column()
-
+ split = layout.split()
+
+ col = split.column()
+ col.itemL(text="Size:")
+ col.itemR(metaelem, "size", text="")
+
+ col = split.column()
col.itemL(text="Settings:")
col.itemR(metaelem, "stiffness", text="Stiffness")
- col.itemR(metaelem, "size", text="Size")
- col.itemL(text="Type:")
- col.row().itemR(metaelem, "type", expand=True)
- col.itemR(metaelem, "negative", text="Negative")
+
+ layout.itemL(text="Type:")
+ layout.itemR(metaelem, "type", expand=True)
+
+ flow = layout.column_flow()
+ flow.itemR(metaelem, "negative", text="Negative")
+ flow.itemR(metaelem, "hide", text="Hide")
bpy.types.register(DATA_PT_context_metaball)
bpy.types.register(DATA_PT_metaball)
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
2009-07-29 18:15:46 UTC (rev 22022)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
2009-07-29 18:44:54 UTC (rev 22023)
@@ -130,7 +130,7 @@
PropertyRNA *prop;
static EnumPropertyItem prop_update_items[] = {
{MB_UPDATE_ALWAYS, "UPDATE_ALWAYS", 0, "Always", "While
editing, update metaball always."},
- {MB_UPDATE_HALFRES, "HALFRES", 0, "Half Resolution", "While
editing, update metaball in half resolution."},
+ {MB_UPDATE_HALFRES, "HALFRES", 0, "Half", "While editing,
update metaball in half resolution."},
{MB_UPDATE_FAST, "FAST", 0, "Fast", "While editing, update
metaball without polygonization."},
{MB_UPDATE_NEVER, "NEVER", 0, "Never", "While editing, don't
update metaball at all."},
{0, NULL, 0, NULL, NULL}};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
