diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 13:07:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-13 13:07:20 +0400 |
commit | 92089e3c4d89c2689dbd4452fb21cbbd9a0ecc71 (patch) | |
tree | b22c37b97efec05c592b86f03a098f56179a7f5b /release/scripts | |
parent | 9c4165fde0ba8c8d05b49240dab8abdf2d187861 (diff) | |
parent | 520778163debe82b8cebe9ddec6ab4111ab2d6bd (diff) |
svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 115 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 3 |
2 files changed, 118 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 179921c3c85..058e8161fe6 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -737,5 +737,120 @@ 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 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="") + + 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") + + 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") + + # Common mask options… + layout.separator() + self.weight_vg_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="") + + 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 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="") + + 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, "falloff_type") + + # Common mask options… + layout.separator() + self.weight_vg_mask(layout, ob, md) + if __name__ == "__main__": # only for live edit. bpy.utils.register_module(__name__) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 23d896abdbb..fd70cc9edb3 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -54,6 +54,9 @@ def draw_gpencil_tools(context, layout): row = col.row() row.operator("gpencil.draw", text="Draw").mode = 'DRAW' row.operator("gpencil.draw", text="Line").mode = 'DRAW_STRAIGHT' + + row = col.row() + row.operator("gpencil.draw", text="Poly").mode = 'DRAW_POLY' row.operator("gpencil.draw", text="Erase").mode = 'ERASER' row = col.row() |