forked from bartvdbraak/blender
Vertex Weight UI:
* Remove check for ob.type mesh, this is done on RNA Level and not needed here * Removed unnecessary row declaration
This commit is contained in:
parent
49547241d6
commit
10ad5e8770
@ -740,7 +740,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
||||
@staticmethod
|
||||
def vertex_weight_mask(layout, ob, md):
|
||||
layout.label(text="Influence/Mask Options:")
|
||||
row = layout.row()
|
||||
|
||||
split = layout.split(percentage=0.4)
|
||||
split.label(text="Global Influence:")
|
||||
@ -757,9 +756,11 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
||||
split.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="")
|
||||
@ -770,88 +771,85 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
|
||||
layout.prop_search(md, "mask_tex_uv_layer", ob.data, "uv_textures")
|
||||
|
||||
def VERTEX_WEIGHT_EDIT(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="")
|
||||
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="")
|
||||
col = split.column()
|
||||
col.label(text="Default Weight:")
|
||||
col.prop(md, "default_weight", text="")
|
||||
|
||||
layout.prop(md, "falloff_type")
|
||||
if md.falloff_type == 'CURVE':
|
||||
col = layout.column()
|
||||
col.template_curve_mapping(md, "map_curve")
|
||||
layout.prop(md, "falloff_type")
|
||||
if md.falloff_type == 'CURVE':
|
||||
col = layout.column()
|
||||
col.template_curve_mapping(md, "map_curve")
|
||||
|
||||
split = layout.split(percentage=0.4)
|
||||
split.prop(md, "use_add")
|
||||
row = split.row()
|
||||
row.active = md.use_add
|
||||
row.prop(md, "add_threshold")
|
||||
split = layout.split(percentage=0.4)
|
||||
split.prop(md, "use_add")
|
||||
row = split.row()
|
||||
row.active = md.use_add
|
||||
row.prop(md, "add_threshold")
|
||||
|
||||
split = layout.split(percentage=0.4)
|
||||
split.prop(md, "use_remove")
|
||||
row = split.row()
|
||||
row.active = md.use_remove
|
||||
row.prop(md, "remove_threshold")
|
||||
split = layout.split(percentage=0.4)
|
||||
split.prop(md, "use_remove")
|
||||
row = split.row()
|
||||
row.active = md.use_remove
|
||||
row.prop(md, "remove_threshold")
|
||||
|
||||
# Common mask options…
|
||||
layout.separator()
|
||||
self.vertex_weight_mask(layout, ob, md)
|
||||
# Common mask options
|
||||
layout.separator()
|
||||
self.vertex_weight_mask(layout, ob, md)
|
||||
|
||||
def VERTEX_WEIGHT_MIX(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="")
|
||||
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.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 = 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="")
|
||||
col.label(text="Mix Set:")
|
||||
col.prop(md, "mix_set", text="")
|
||||
|
||||
# Common mask options…
|
||||
layout.separator()
|
||||
self.vertex_weight_mask(layout, ob, md)
|
||||
# Common mask options
|
||||
layout.separator()
|
||||
self.vertex_weight_mask(layout, ob, md)
|
||||
|
||||
def VERTEX_WEIGHT_PROXIMITY(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="")
|
||||
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="")
|
||||
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)
|
||||
layout.row().prop(md, "proximity_mode", expand=True)
|
||||
if md.proximity_mode == 'GEOMETRY':
|
||||
layout.row().prop(md, "proximity_geometry", expand=True)
|
||||
|
||||
row = layout.split()
|
||||
row.prop(md, "min_dist")
|
||||
row.prop(md, "max_dist")
|
||||
row = layout.row()
|
||||
row.prop(md, "min_dist")
|
||||
row.prop(md, "max_dist")
|
||||
|
||||
layout.prop(md, "falloff_type")
|
||||
layout.prop(md, "falloff_type")
|
||||
|
||||
# Common mask options…
|
||||
layout.separator()
|
||||
self.vertex_weight_mask(layout, ob, md)
|
||||
# Common mask options
|
||||
layout.separator()
|
||||
self.vertex_weight_mask(layout, ob, md)
|
||||
|
||||
if __name__ == "__main__": # only for live edit.
|
||||
bpy.utils.register_module(__name__)
|
||||
|
Loading…
Reference in New Issue
Block a user