[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32399] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: weight-paint in solid draw mode would draw the wire twice, also change wire drawing to draw all edges and better visibility over yellow areas .

[Campbell Barton]

Revision: 32399
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32399
Author:   campbellbarton
Date:     2010-10-11 00:15:48 +0200 (Mon, 11 Oct 2010)

Log Message:
-----------
weight-paint in solid draw mode would draw the wire twice, also change wire drawing to draw all edges and better visibility over yellow areas.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-10-10 21:39:24 UTC (rev 32398)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-10-10 22:15:48 UTC (rev 32399)
@@ -2520,24 +2520,25 @@
 			 * rather then the shading, this is also forced in wire view */
 			GPU_enable_material(0, NULL);
 			dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me->mface, 1, GPU_enable_material);
-
+		
 			bglPolygonOffset(rv3d->dist, 1.0);
 			glDepthMask(0);	// disable write in zbuffer, selected edge wires show better
 
 			glEnable(GL_BLEND);
-			glColor4ub(196, 196, 196, 196);
+			glColor4ub(255, 255, 255, 96);
 			glEnable(GL_LINE_STIPPLE);
-			glLineStipple(1, 0x8888);
+			glLineStipple(1, 0xAAAA);
 
-			dm->drawEdges(dm, 1, 0);
+			dm->drawEdges(dm, 1, 1);
 
 			bglPolygonOffset(rv3d->dist, 0.0);
 			glDepthMask(1);
 			glDisable(GL_LINE_STIPPLE);
 
 			GPU_disable_material();
-
-
+			
+			/* since we already draw wire as wp guide, dont draw over the top */
+			draw_wire= 0;
 		}
 		else {
 			Paint *p;