[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45949] trunk/blender/source/blender/ editors/space_view3d: now vertex paint uses the same overrides as weight paint - so wire draw mode allows vertex paint to be unlit (which is quite handy, previously you had to hide lamps).

[Campbell Barton]

Revision: 45949
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45949
Author:   campbellbarton
Date:     2012-04-24 23:47:10 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
now vertex paint uses the same overrides as weight paint - so wire draw mode allows vertex paint to be unlit (which is quite handy, previously you had to hide lamps).

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

Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2012-04-24 22:50:49 UTC (rev 45948)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2012-04-24 23:47:10 UTC (rev 45949)
@@ -349,7 +349,7 @@
 
 	/* texture draw is abused for mask selection mode, do this so wire draw
 	 * with face selection in weight paint is not lit. */
-	if ((v3d->drawtype <= OB_WIRE) && (ob->mode & OB_MODE_WEIGHT_PAINT)) {
+	if ((v3d->drawtype <= OB_WIRE) && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT))) {
 		solidtex = FALSE;
 		Gtexdraw.islit = 0;
 	}
@@ -953,7 +953,7 @@
 
 	glEnable(GL_LIGHTING);
 
-	if (ob->mode & OB_MODE_WEIGHT_PAINT) {
+	if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
 		/* weight paint mode exception */
 		dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions_material,
 		                    GPU_enable_material, NULL, ob->data, DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH);

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-04-24 22:50:49 UTC (rev 45948)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-04-24 23:47:10 UTC (rev 45949)
@@ -3306,7 +3306,7 @@
 		}
 	}
 	else if (dt == OB_SOLID) {
-		if (is_obact && ob->mode & OB_MODE_WEIGHT_PAINT) {
+		if (is_obact && ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
 			/* weight paint in solid mode, special case. focus on making the weights clear
 			 * rather than the shading, this is also forced in wire view */
 			GPU_enable_material(0, NULL);