[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12303] trunk/blender/source/blender/src: Fix "Remove Doubles" of w menu and a couple of typos:

[Juho Vepsalainen]

Revision: 12303
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12303
Author:   bebraw
Date:     2007-10-20 14:16:54 +0200 (Sat, 20 Oct 2007)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editobject.c
    trunk/blender/source/blender/src/header_view3d.c
    trunk/blender/source/blender/src/toolbox.c

Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c	2007-10-20 11:28:58 UTC (rev 12302)
+++ trunk/blender/source/blender/src/editobject.c	2007-10-20 12:16:54 UTC (rev 12303)
@@ -2429,7 +2429,7 @@
 			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:

Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c	2007-10-20 11:28:58 UTC (rev 12302)
+++ trunk/blender/source/blender/src/header_view3d.c	2007-10-20 12:16:54 UTC (rev 12303)
@@ -1026,7 +1026,7 @@
 	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 @@
 					 "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 @@
 	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, "");

Modified: trunk/blender/source/blender/src/toolbox.c
===================================================================
--- trunk/blender/source/blender/src/toolbox.c	2007-10-20 11:28:58 UTC (rev 12302)
+++ trunk/blender/source/blender/src/toolbox.c	2007-10-20 12:16:54 UTC (rev 12303)
@@ -921,8 +921,8 @@
 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},