Index: source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/blenkernel/intern/cdderivedmesh.c,v
retrieving revision 1.10
diff -u -r1.10 cdderivedmesh.c
--- source/blender/blenkernel/intern/cdderivedmesh.c	8 Jan 2007 23:47:03 -0000	1.10
+++ source/blender/blenkernel/intern/cdderivedmesh.c	8 Feb 2007 18:30:38 -0000
@@ -216,8 +216,8 @@
 		
 	glBegin(GL_LINES);
 	for(i = 0; i < dm->numEdgeData; i++, medge++) {
-		if((medge->flag&ME_EDGEDRAW)
-		   && (drawLooseEdges || !(medge->flag&ME_LOOSEEDGE))) {
+		if((G.f & G_ALLEDGES) || ((medge->flag&ME_EDGEDRAW)
+		   && (drawLooseEdges || !(medge->flag&ME_LOOSEEDGE)))) {
 			glVertex3fv(mvert[medge->v1].co);
 			glVertex3fv(mvert[medge->v2].co);
 		}
Index: source/blender/src/buttons_editing.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_editing.c,v
retrieving revision 1.358
diff -u -r1.358 buttons_editing.c
--- source/blender/src/buttons_editing.c	6 Feb 2007 03:38:32 -0000	1.358
+++ source/blender/src/buttons_editing.c	8 Feb 2007 17:45:23 -0000
@@ -4206,7 +4493,6 @@
 	uiBlockEndAlign(block);
 	
 	uiBlockBeginAlign(block);
-	uiDefButBitI(block, TOG, G_ALLEDGES, 0, "All Edges",			1125, 22,150,19, &G.f, 0, 0, 0, 0, "Displays all edges in object mode without optimization");
 	uiDefButBitS(block, TOG, B_MESH_X_MIRROR, B_DIFF, "X-axis mirror",1125,0,150,19, &G.scene->toolsettings->editbutflag, 0, 0, 0, 0, "While using transforms, mirrors the transformation");
 	uiBlockEndAlign(block);
 }
Index: source/blender/src/buttons_object.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_object.c,v
retrieving revision 1.210
diff -u -r1.210 buttons_object.c
--- source/blender/src/buttons_object.c	6 Jan 2007 10:59:07 -0000	1.210
+++ source/blender/src/buttons_object.c	8 Feb 2007 18:29:23 -0000
@@ -2065,6 +2065,7 @@
 	uiDefButBitC(block, TOG, OB_DRAWTRANSP, REDRAWVIEW3D, "Transp",	120, 40, 90, 20, &ob->dtx, 0, 0, 0, 0, "Enables transparent materials for the active object (Mesh only)");
 	uiDefButBitC(block, TOG, OB_DRAWXRAY, REDRAWVIEW3D, "X-ray",	210, 40, 90, 20, &ob->dtx, 0, 0, 0, 0, "Makes the active object draw in front of others");
 	
+	uiDefButBitI(block, TOG, G_ALLEDGES, REDRAWVIEW3D, "All Edges",	120, 20,90,19, &G.f, 0, 0, 0, 0, "Displays all edges in object mode without optimization");
 }
 
 void object_panel_constraint(char *context)