- Removed new outline drawing from vpaint/faceselect and other paint modes

- fixed tooltip drawing in color picker

source/blender/src/drawobject.c

@@ -3624,7 +3624,10 @@ void draw_object(Base *base)
 	}
 
 	/* draw outline for selected solid objects */
-	if(dt>OB_WIRE && ob!=G.obedit && (G.f & G_BACKBUFSEL)==0) draw_solid_select(ob);
+	if(dt>OB_WIRE && ob!=G.obedit && (G.f & G_BACKBUFSEL)==0) {
+		if((G.f & (G_VERTEXPAINT|G_FACESELECT|G_TEXTUREPAINT|G_WEIGHTPAINT))==0)
+			draw_solid_select(ob);
+	}
 
 	switch( ob->type) {