archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

added Goofster's mergemenu to the alt-w menu.

Browse Source 
revised by Matt Ebb
This commit is contained in:
Rob Haarsma
2003-05-10 12:22:26 +00:00
parent 8218dd2614
commit 3c77276bd7
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/src/edit.c
View File

@@ -1177,18 +1177,18 @@ void mergemenu(void)
extern float doublimit; extern float doublimit;
short event; short event;
event = pupmenu("MERGE %t|At Cursor%x1|At Center%x2"); event = pupmenu("MERGE %t|At Center%x1|At Cursor%x2");
switch (event) { switch (event) {
case 1: /*Merge at Cursor*/ case 1: /*Merge at center of selection*/
snap_sel_to_curs(); snap_to_center();
notice("Removed: %d\n", removedoublesflag(1, doublimit)); notice("Removed: %d", removedoublesflag(1, doublimit));
allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWVIEW3D, 0);
break; break;
case 2: /*Merge at center of selection*/ case 2: /*Merge at Cursor*/
snap_to_center(); snap_sel_to_curs();
notice("Removed: %d\n", removedoublesflag(1, doublimit)); notice("Removed: %d", removedoublesflag(1, doublimit));
allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWVIEW3D, 0);
break; break;
} }

15
source/blender/src/editobject.c
View File

@@ -1506,7 +1506,7 @@ void special_editmenu(void)
} }
else if(G.obedit->type==OB_MESH) { else if(G.obedit->type==OB_MESH) {
nr= 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= pupmenu("Specials%t|Subdivide%x1|Subdivide Fractal%x2|Subdivide Smooth%x3|Merge%x4|Remove Doubles%x5|Hide%x6|Reveal%x7|Select swap%x8|Flip Normals %x9|Smooth %x10");
if(nr>0) waitcursor(1); if(nr>0) waitcursor(1);
switch(nr) { switch(nr) {
@@ -1523,21 +1523,24 @@ void special_editmenu(void)
subdivideflag(1, 0.0, editbutflag | B_SMOOTH); subdivideflag(1, 0.0, editbutflag | B_SMOOTH);
break; break;
case 4: case 4:
notice("Removed: %d\n", removedoublesflag(1, doublimit)); mergemenu();
break; break;
case 5: case 5:
hide_mesh(0); notice("Removed: %d", removedoublesflag(1, doublimit));
break; break;
case 6: case 6:
reveal_mesh(); hide_mesh(0);
break; break;
case 7: case 7:
selectswap_mesh(); reveal_mesh();
break; break;
case 8: case 8:
flip_editnormals(); selectswap_mesh();
break; break;
case 9: case 9:
flip_editnormals();
break;
case 10:
vertexsmooth(); vertexsmooth();
break; break;
} }

13
source/blender/src/space.c
View File

@@ -877,11 +877,14 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
else make_local(); else make_local();
} }
break; break;
case MKEY: case MKEY:
if((G.obedit) && (G.qual & LR_ALTKEY)) if((G.obedit) && (G.qual & LR_ALTKEY)) {
mergemenu(); if(G.obedit->type==OB_MESH) mergemenu();
else movetolayer(); }
break; else {
movetolayer();
}
break;
case NKEY: case NKEY:
if(G.obedit) { if(G.obedit) {
switch (G.obedit->type){ switch (G.obedit->type){