[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33318] trunk/blender/source/blender/ editors/space_view3d/drawmesh.c: bugfix while looking into [#24900], color wasn't being set for face-mask mode.

[Campbell Barton]

Revision: 33318
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33318
Author:   campbellbarton
Date:     2010-11-25 22:59:12 +0100 (Thu, 25 Nov 2010)

Log Message:
-----------
bugfix while looking into [#24900], color wasn't being set for face-mask mode.

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

Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2010-11-25 20:50:50 UTC (rev 33317)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2010-11-25 21:59:12 UTC (rev 33318)
@@ -661,8 +661,9 @@
 	/* draw the textured mesh */
 	draw_textured_begin(scene, v3d, rv3d, ob);
 
+	glColor4f(1.0f,1.0f,1.0f,1.0f);
+
 	if(ob->mode & OB_MODE_EDIT) {
-		glColor4f(1.0f,1.0f,1.0f,1.0f);
 		dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, me->edit_mesh);
 	} else if(faceselect) {
 		if(ob->mode & OB_MODE_WEIGHT_PAINT)
@@ -674,7 +675,6 @@
 		if( GPU_buffer_legacy(dm) )
 			dm->drawFacesTex(dm, draw_tface__set_draw_legacy);
 		else {
-			glColor4f(1.0f,1.0f,1.0f,1.0f);
 			if( !CustomData_has_layer(&dm->faceData,CD_TEXTURE_MCOL) )
 				add_tface_color_layer(dm);
 			dm->drawFacesTex(dm, draw_tface__set_draw);