archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Sculpt Branch:

Browse Source 
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24889:25180
This commit is contained in:
Brecht Van Lommel
2009-12-07 19:22:48 +00:00
parent 4ca2581b77 fc69c54c4c
commit 82ddfbf99f
383 changed files with 31716 additions and 24473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
release/scripts/ui/properties_data_modifier.py
View File

@@ -365,11 +365,11 @@ class DATA_PT_modifiers(DataButtonsPanel):
def MESH_DEFORM(self, layout, ob, md, wide_ui):
split = layout.split()
col = split.column()
col.label(text="Object:")
col.prop(md, "object", text="")
if md.object and md.object.type == 'ARMATURE':
col.label(text="Bone:")
col.prop_object(md, "subtarget", md.object.data, "bones", text="")
sub = col.column()
sub.label(text="Object:")
sub.prop(md, "object", text="")
sub.prop(md, "mode", text="")
sub.active = not md.is_bound
if wide_ui:
col = split.column()
col.label(text="Vertex Group:")
@@ -385,14 +385,16 @@ class DATA_PT_modifiers(DataButtonsPanel):
layout.operator("object.meshdeform_bind", text="Unbind")
else:
layout.operator("object.meshdeform_bind", text="Bind")
split = layout.split()
col = split.column()
col.prop(md, "precision")
if md.mode == 'VOLUME':
split = layout.split()
if wide_ui:
col = split.column()
col.prop(md, "dynamic")
col.prop(md, "precision")
if wide_ui:
col = split.column()
col.prop(md, "dynamic")
def MIRROR(self, layout, ob, md, wide_ui):
layout.prop(md, "merge_limit")
@@ -554,7 +556,7 @@ class DATA_PT_modifiers(DataButtonsPanel):
col.label(text="Origin:")
col.prop(md, "origin", text="")
sub = col.column()
sub.active = md.origin
sub.active = (md.origin != "")
sub.prop(md, "relative")
if wide_ui: