[Bf-committers] Specials menu 'merge' patch

[Matt Ebb]

This is a multi-part message in MIME format.

------=_NextPart_000_026E_01C30F82.CA923350
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Sorry, that was dumb - I should have included this too. I also changed the
merge menu order so that 'At Center' is the default option, for speedier
operation.

The 3D cursor needs to be adjusted to the correct position before the
merging, so it's a slower process than merging to center anyway. It's a
faster workflow for merging to center if the user can just keep clicking in
the same spot, rather than adjusting the mouse position for each menu.

You can disregard the last edit.c.diff if you like and apply this instead.


Matt


----- Original Message ----- 
From: "Matt Ebb" <matt@mke3.net>
To: <bf-committers@blender.org>
Sent: Thursday, May 01, 2003 1:25 AM
Subject: [Bf-committers] Specials menu 'merge' patch


> 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_026E_01C30F82.CA923350
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:36:16.000000000 +1000=0A=
@@ -1177,17 +1177,18 @@=0A=
 	extern float doublimit;
 	short event;
=20
-	event =3D pupmenu("MERGE %t|At Cursor%x1|At Center%x2");
+	event =3D pupmenu("Merge %t|At Center%x1|At Cursor%x2");
=20
 	switch (event) {
=20
-	    case 1: /*Merge at Cursor*/
-		    snap_sel_to_curs();
+	    case 1: /*Merge at center of selection*/
+		    snap_to_center();
 		    notice("Removed: %d\n", removedoublesflag(1, doublimit));
 		    allqueue(REDRAWVIEW3D, 0);
 		    break;
-	    case 2: /*Merge at center of selection*/
-		    snap_to_center();
+
+	    case 2: /*Merge at Cursor*/
+		    snap_sel_to_curs();
 		    notice("Removed: %d\n", removedoublesflag(1, doublimit));
 		    allqueue(REDRAWVIEW3D, 0);
 		    break;

------=_NextPart_000_026E_01C30F82.CA923350--