sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

2.5 MetaBalls:

Browse Source 
* Layout tweaks by nudelZ. Thanks!
This commit is contained in:
Thomas Dinges 2009-07-29 18:44:54 +00:00
parent da14738624
commit 2621dd90e3
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
release/ui/buttons_data_metaball.py
View File

@ -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)

2
source/blender/makesrna/intern/rna_meta.c
View File

@ -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}};