reverted Mesh Specials WKey menu.

Ctrl+V/E/F are still there but Andy and Ton requested this unchanged.

1 files changed, 83 insertions, 1 deletions

diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 9188e73e76d..44b93789690 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -2351,7 +2351,45 @@ void special_editmenu(void)
 		}
 	}
 	else if(G.obedit->type==OB_MESH) {
+		/* This is all that is needed, since all other functionality is in Ctrl+ V/E/F but some users didnt like, so for now have the old/big menu */
+		/*
 		nr= pupmenu("Subdivide Mesh%t|Subdivide%x1|Subdivide Multi%x2|Subdivide Multi Fractal%x3|Subdivide Smooth%x4");
+		switch(nr) {
+		case 1:
+			waitcursor(1);
+			esubdivideflag(1, 0.0, G.scene->toolsettings->editbutflag, 1, 0);
+			
+			BIF_undo_push("ESubdivide Single");            
+			break;
+		case 2:
+			if(button(&numcuts, 1, 128, "Number of Cuts:")==0) return;
+			waitcursor(1);
+			esubdivideflag(1, 0.0, G.scene->toolsettings->editbutflag, numcuts, 0);
+			BIF_undo_push("ESubdivide");
+			break;
+		case 3:
+			if(button(&numcuts, 1, 128, "Number of Cuts:")==0) return;
+			randfac= 10;
+			if(button(&randfac, 1, 100, "Rand fac:")==0) return;
+			waitcursor(1);			
+			fac= -( (float)randfac )/100;
+			esubdivideflag(1, fac, G.scene->toolsettings->editbutflag, numcuts, 0);
+			BIF_undo_push("Subdivide Fractal");
+			break;
+			
+		case 4:
+			fac= 1.0f;
+			if(fbutton(&fac, 0.0f, 5.0f, 10, 10, "Smooth:")==0) return;
+				fac= 0.292f*fac;
+			
+			waitcursor(1);
+			esubdivideflag(1, fac, G.scene->toolsettings->editbutflag | B_SMOOTH, 1, 0);
+			BIF_undo_push("Subdivide Smooth");
+			break;		
+		}
+		*/
+		
+		nr= pupmenu("Specials%t|Subdivide%x1|Subdivide Multi%x2|Subdivide Multi Fractal%x3|Subdivide Smooth%x12|Merge%x4|Remove Doubles%x5|Hide%x6|Reveal%x7|Select Swap%x8|Flip Normals %x9|Smooth %x10|Bevel %x11|Set Smooth %x14|Set Solid %x15|Blend From Shape%x16|Propagate To All Shapes%x17|Select Vertex Path%x18");
 		
 		switch(nr) {
 		case 1:
@@ -2376,7 +2414,7 @@ void special_editmenu(void)
 			BIF_undo_push("Subdivide Fractal");
 			break;
 			
-		case 4:	/* smooth */
+		case 12:	/* smooth */
 			/* if(button(&numcuts, 1, 128, "Number of Cuts:")==0) return; */
 			fac= 1.0f;
 			if(fbutton(&fac, 0.0f, 5.0f, 10, 10, "Smooth:")==0) return;
@@ -2386,8 +2424,52 @@ void special_editmenu(void)
 			esubdivideflag(1, fac, G.scene->toolsettings->editbutflag | B_SMOOTH, 1, 0);
 			BIF_undo_push("Subdivide Smooth");
 			break;		
+			
+		case 4:
+			mergemenu();
+			break;
+		case 5:
+			notice("Removed %d Vertices", removedoublesflag(1, G.scene->toolsettings->doublimit));
+			BIF_undo_push("Remove Doubles");
+			break;
+		case 6:
+			hide_mesh(0);
+			break;
+		case 7:
+			reveal_mesh();
+			break;
+		case 8:
+			selectswap_mesh();
+			break;
+		case 9:
+			flip_editnormals();
+			BIF_undo_push("Flip Normals");
+			break;
+		case 10:
+			vertexsmooth();
+			break;
+		case 11:
+			bevel_menu();
+			break;
+		case 14:
+			mesh_set_smooth_faces(1);
+			break;
+		case 15: 
+			mesh_set_smooth_faces(0);
+			break;
+		case 16: 
+			shape_copy_select_from();
+			break;
+		case 17: 
+			shape_propagate();
+			break;
+		case 18:
+			pathselect();
+			BIF_undo_push("Select Vertex Path");
+			break;
 		}
 		
+		
 		DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
 		
 		if(nr>0) waitcursor(0);