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

svn merge -r39990:39991 https://svn.blender.org/svnroot/bf-blender/trunk/blender/release --accept theirs-full

Browse Source
This commit is contained in:
Campbell Barton 2011-09-08 07:23:01 +00:00
commit 3debc930e8
2 changed files with 112 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/blenderbuttons
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 KiB

After

Width:  |  Height:  |  Size: 210 KiB

112
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -741,5 +741,117 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col.prop(md, "width", slider=True)
col.prop(md, "narrowness", slider=True)
@staticmethod
def weight_vg_mask(layout, ob, md):
layout.label(text="Influence/Mask Options:")
split = layout.split()
col1 = split.column()
col2 = split.column()
col1.label(text="Global Influence:")
col2.prop(md, "mask_constant", text="")
if not md.mask_texture:
col1.label(text="Vertex Group Mask:")
col2.prop_search(md, "mask_vertex_group", ob, "vertex_groups", text="")
if not md.mask_vertex_group:
col1.label(text="Texture Mask:")
col2.template_ID(md, "mask_texture", new="texture.new")
if md.mask_texture:
split = layout.split()
col = split.column()
col.label(text="Texture Coordinates:")
col.prop(md, "mask_tex_mapping", text="")
col = split.column()
col.label(text="Use Channel:")
col.prop(md, "mask_tex_use_channel", text="")
if md.mask_tex_mapping == 'OBJECT':
layout.prop(md, "mask_tex_map_object", text="Object")
elif md.mask_tex_mapping == 'UV' and ob.type == 'MESH':
layout.prop_search(md, "mask_tex_uv_layer", ob.data, "uv_textures")
def WEIGHT_VGEDIT(self, layout, ob, md):
if ob.type == 'MESH':
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="")
layout.prop(md, "mapping_mode")
if md.mapping_mode == 'CURVE':
col = layout.column()
col.template_curve_mapping(md, "map_curve")
row = layout.row()
row.prop(md, "use_add")
row.prop(md, "use_remove")
row = layout.row()
if md.use_add:
row.prop(md, "add_threshold")
if md.use_remove:
row.prop(md, "remove_threshold")
# Common mask options…
layout.separator()
self.weight_vg_mask(layout, ob, md)
def WEIGHT_VGMIX(self, layout, ob, md):
if ob.type == 'MESH':
split = layout.split()
col = split.column()
col.label(text="Vertex Group A:")
col.prop_search(md, "vertex_group_a", ob, "vertex_groups", text="")
col.label(text="Default Weight A:")
col.prop(md, "default_weight_a", text="")
col.label(text="Mix Mode:")
col.prop(md, "mix_mode", text="")
col = split.column()
col.label(text="Vertex Group B:")
col.prop_search(md, "vertex_group_b", ob, "vertex_groups", text="")
col.label(text="Default Weight B:")
col.prop(md, "default_weight_b", text="")
col.label(text="Mix Set:")
col.prop(md, "mix_set", text="")
# Common mask options…
layout.separator()
self.weight_vg_mask(layout, ob, md)
def WEIGHT_VGPROXIMITY(self, layout, ob, md):
if ob.type == 'MESH':
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="Target Object:")
col.prop(md, "target", text="")
row = layout.row()
row.prop(md, "proximity_mode", expand=True)
if md.proximity_mode == 'GEOMETRY':
row = layout.row()
row.prop(md, "proximity_geometry", expand=True)
row = layout.split()
row.prop(md, "min_dist")
row.prop(md, "max_dist")
layout.prop(md, "mapping_mode")
# Common mask options…
layout.separator()
self.weight_vg_mask(layout, ob, md)
if __name__ == "__main__": # only for live edit.
bpy.utils.register_module(__name__)