diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-26 15:46:55 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-26 15:46:55 +0400 |
| commit | 63f1e253c360dcb550bc4b492ccdf0bebf3afa22 (patch) | |
| tree | 1dfc762a92efa44b1eb301f970bbf98f7f46827c /release | |
| parent | 00234dab2f1a697a33659beee4f4c8856b5ce233 (diff) | |
| parent | d5fd3b36888902367b07d92f7c606a95d603e23b (diff) | |
Merged revision(s) 57671-57767 from trunk/blender into soc-2013-dingto
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/startup.blend | bin | 442524 -> 442640 bytes | |||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/datafiles/startup.blend b/release/datafiles/startup.blend Binary files differindex e7177159fae..805308cf662 100644 --- a/release/datafiles/startup.blend +++ b/release/datafiles/startup.blend diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 74f9d36db0a..3dedfac103a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1317,8 +1317,8 @@ class VIEW3D_MT_vertex_group(Menu): if ob.vertex_groups.active: layout.separator() layout.operator("object.vertex_group_assign", text="Assign to Active Group").new = False - layout.operator("object.vertex_group_remove_from", text="Remove from Active Group").all = False - layout.operator("object.vertex_group_remove_from", text="Remove from All").all = True + layout.operator("object.vertex_group_remove_from", text="Remove from Active Group").use_all_groups = False + layout.operator("object.vertex_group_remove_from", text="Remove from All").use_all_groups = True layout.separator() if ob.vertex_groups.active: |