diff options
| author | Juho Vepsalainen <bebraw@gmail.com> | 2007-10-20 16:16:54 +0400 |
|---|---|---|
| committer | Juho Vepsalainen <bebraw@gmail.com> | 2007-10-20 16:16:54 +0400 |
| commit | e5a9e0b12a6d6aa334561edaf8a839f3f1a8d7d4 (patch) | |
| tree | 76469e855b314a372af15acd078ae59daa4834f1 | |
| parent | a4c8783153b7ba94d74e7ff1e0ceafda731c6528 (diff) | |
Fix "Remove Doubles" of w menu and a couple of typos:
This commit makes "Remove Doubles" of w menu to work again.
Also renamed "AutoMarge" to "AutoMerge".
Added shortcut of "Select Inverse" to menus and renamed
"Select/Deselect All" to be consistent with rest of Blender.
| -rw-r--r-- | source/blender/src/editobject.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_view3d.c | 8 | ||||
| -rw-r--r-- | source/blender/src/toolbox.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 885796d882b..593d9ecdcdc 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -2429,7 +2429,7 @@ void special_editmenu(void) mergemenu(); break; case 5: - notice("Removed %d Vertices", removedoublesflag(1, 1, G.scene->toolsettings->doublimit)); + notice("Removed %d Vertices", removedoublesflag(1, 0, G.scene->toolsettings->doublimit)); BIF_undo_push("Remove Doubles"); break; case 6: diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index d64f8a8d169..534c87a093a 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -1026,7 +1026,7 @@ static uiBlock *view3d_select_meshmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select/Deselect All|A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Inverse", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Inverse|Ctrl I", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); @@ -1039,7 +1039,7 @@ static uiBlock *view3d_select_meshmenu(void *arg_unused) "Sharp Edges|Ctrl Alt Shift S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 14, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, - "Linked flat faces|Ctrl Alt Shift F", + "Linked Flat Faces|Ctrl Alt Shift F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 15, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, @@ -3053,9 +3053,9 @@ static uiBlock *view3d_edit_meshmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); if(G.scene->automerge) { - uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "AutoMarge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "AutoMerge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); } else { - uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "AutoMarge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "AutoMerge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); } uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 1951f3b1205..f517eec055c 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -921,8 +921,8 @@ static TBitem tb_face_select[]= { static TBitem tb_mesh_select[]= { { 0, "Border Select|B", 0, NULL}, { 0, "SEPR", 0, NULL}, -{ 0, "(De)select All|A", 2, NULL}, -{ 0, "Inverse", 3, NULL}, +{ 0, "Select/Deselect All|A", 2, NULL}, +{ 0, "Inverse|Ctrl I", 3, NULL}, { 0, "SEPR", 0, NULL}, { 0, "Random...", 5, NULL}, { 0, "Non-Manifold|Shift Ctrl Alt M", 9, NULL}, |