[Bf-committers] Specials menu 'merge' patch

[Matt Ebb]

This is a multi-part message in MIME format.

------=_NextPart_000_024F_01C30F80.9111F6D0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Here's a patch against 2003-04-30 CVS to make Goofster's ALT-M 'Merge'
feature appear in the WKEY Specials menu for meshes. I also changed the menu
title to title case from upper case for consistency with other menus.

Should the ALT-M hotkey be disabled in curve/nurbs editing? It only works
halfway, since it can't remove doubles. This is confusing for users since it
works differently in different contexts. The merge menu is also available in
metaball editmode, and it should be prevented from doing so, since it
doesn't work at all on metaballs

Cheers

Matt.

------=_NextPart_000_024F_01C30F80.9111F6D0
Content-Type: application/octet-stream;
	name="edit.c.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="edit.c.diff"

--- =
blender/src/bf-blender-2003-04-30/bf-blender/blender/source/blender/src/e=
dit.c	2003-04-29 00:43:20.000000000 +1000=0A=
+++ Documents and Settings/matt/Desktop/edit.c	2003-05-01 =
01:18:22.000000000 +1000=0A=
@@ -1177,7 +1177,7 @@=0A=
 	extern float doublimit;
 	short event;
=20
-	event =3D pupmenu("MERGE %t|At Cursor%x1|At Center%x2");
+	event =3D pupmenu("Merge %t|At Cursor%x1|At Center%x2");
=20
 	switch (event) {
=20

------=_NextPart_000_024F_01C30F80.9111F6D0
Content-Type: application/octet-stream;
	name="editobject.c.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="editobject.c.diff"

--- =
blender/src/bf-blender-2003-04-30/bf-blender/blender/source/blender/src/e=
ditobject.c	2003-04-30 01:31:00.000000000 +1000=0A=
+++ Documents and Settings/matt/Desktop/editobject.c	2003-05-01 =
01:08:54.000000000 +1000=0A=
@@ -1506,7 +1506,7 @@=0A=
 	}
 	else if(G.obedit->type=3D=3DOB_MESH) {
=20
-		nr=3D pupmenu("Specials%t|Subdivide%x1|Subdivide Fractal%x2|Subdivide =
Smooth%x3|Remove Doubles%x4|Hide%x5|Reveal%x6|Select swap%x7|Flip =
Normals %x8|Smooth %x9");
+		nr=3D pupmenu("Specials%t|Subdivide%x1|Subdivide Fractal%x2|Subdivide =
Smooth%x3|Merge Vertices%x4|Remove Doubles%x5|Hide%x6|Reveal%x7|Select =
swap%x8|Flip Normals %x9|Smooth %x10");
 		if(nr>0) waitcursor(1);
 	=09
 		switch(nr) {
@@ -1523,21 +1523,24 @@=0A=
 			subdivideflag(1, 0.0, editbutflag | B_SMOOTH);
 			break;
 		case 4:
-			notice("Removed: %d\n", removedoublesflag(1, doublimit));
+			mergemenu();
 			break;
 		case 5:
-			hide_mesh(0);
+			notice("Removed: %d\n", removedoublesflag(1, doublimit));
 			break;
 		case 6:
-			reveal_mesh();
+			hide_mesh(0);
 			break;
 		case 7:
-			selectswap_mesh();
+			reveal_mesh();
 			break;
 		case 8:
-			flip_editnormals();
+			selectswap_mesh();
 			break;
 		case 9:
+			flip_editnormals();
+			break;
+		case 10:
 			vertexsmooth();
 			break;
 		}	=09

------=_NextPart_000_024F_01C30F80.9111F6D0--