From 2621dd90e39e7d447255d86a7111641d2098e404 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 29 Jul 2009 18:44:54 +0000 Subject: [PATCH] 2.5 MetaBalls: * Layout tweaks by nudelZ. Thanks! --- release/ui/buttons_data_metaball.py | 38 +++++++++++++++-------- source/blender/makesrna/intern/rna_meta.c | 2 +- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/release/ui/buttons_data_metaball.py b/release/ui/buttons_data_metaball.py index 03f489aeb9b..b2e2728afe5 100644 --- a/release/ui/buttons_data_metaball.py +++ b/release/ui/buttons_data_metaball.py @@ -35,16 +35,20 @@ class DATA_PT_metaball(DataButtonsPanel): 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 @@ class DATA_PT_metaball_element(DataButtonsPanel): 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) diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index d57c102a35f..279e1e084b0 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -130,7 +130,7 @@ void rna_def_metaball(BlenderRNA *brna) 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}};