Index: buttons_editing.c
===================================================================
--- buttons_editing.c	(revision 19)
+++ buttons_editing.c	(working copy)
@@ -6095,6 +6095,10 @@
 	}
 	else if(G.f & G_VERTEXPAINT) {
 		extern VPaint Gvp;         /* from vpaint */
+		Object *ob;
+		ob= OBACT;
+	
+		if(ob==NULL) return;
 		
 		uiBlockBeginAlign(block);
 		uiDefButF(block, NUMSLI, B_NOP, "R ",			979,170,150,19, &Gvp.r, 0.0, 1.0, B_VPCOLSLI, 0, "The amount of red used for painting");
@@ -6125,6 +6129,8 @@
 			uiDefButBitI(block, TOG, G_DRAWFACES, B_UVAUTO_DRAWFACES, "Faces",	979,50,60,19, &G.f, 0, 0, 0, 0, "Displays all faces as shades");
 			uiDefButBitI(block,TOG, G_DRAWEDGES, REDRAWVIEW3D,"Edges",1039,50,60,19, &G.f, 2.0, 0, 0, 0,  "Displays edges of visible faces");
 		 	uiDefButBitI(block,TOG, G_HIDDENEDGES, REDRAWVIEW3D,"Hidden Edges",1099,50,100,19, &G.f, 2.0, 1.0, 0, 0,  "Displays edges of hidden faces");
+		} else{
+ 			uiDefButBitC(block, TOG, OB_DRAWWIRE, REDRAWVIEW3D, "Wire",	979,50,75,19, &ob->dtx, 0, 0, 0, 0, "Displays the active object's wireframe in shaded drawing modes");
 		}
 		uiBlockEndAlign(block);