svn merge ^/trunk/blender -r43062:43085

This commit is contained in:
Campbell Barton
2012-01-03 02:16:52 +00:00
34 changed files with 597 additions and 243 deletions

View File

@@ -1051,7 +1051,7 @@ class VIEW3D_MT_vertex_group(Menu):
layout.operator("object.vertex_group_assign", text="Assign to New Group").new = True
ob = context.active_object
if ob.mode == 'EDIT':
if ob.mode == 'EDIT' or (ob.mode == 'WEIGHT_PAINT' and ob.type == 'MESH' and ob.data.use_paint_mask_vertex):
if ob.vertex_groups.active:
layout.separator()
layout.operator("object.vertex_group_assign", text="Assign to Active Group")