[Bf-blender-cvs] [0d71ea5] master: Fix T47389: WPaint + texture entirely transparent

[Campbell Barton]

Commit: 0d71ea54d0d36a485955368a3324636f824cc361
Author: Campbell Barton
Date:   Thu Feb 11 18:48:28 2016 +1100
Branches: master
https://developer.blender.org/rB0d71ea54d0d36a485955368a3324636f824cc361

Fix T47389: WPaint + texture entirely transparent

===================================================================

M	source/blender/editors/space_view3d/drawmesh.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 039cc74..345e479 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -964,12 +964,6 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d
 
 		dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, compareDrawOptionsEm, &data, 0);
 	}
-	else if ((draw_flags & DRAW_FACE_SELECT) &&
-	         (ob->mode & OB_MODE_WEIGHT_PAINT))
-	{
-		dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions_facemask, GPU_object_material_bind, NULL, me,
-		                    DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH | DM_DRAW_SKIP_HIDDEN);
-	}
 	else {
 		DMDrawFlag dm_draw_flag;
 		drawTFace_userData userData;
@@ -981,8 +975,14 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d
 			dm_draw_flag = DM_DRAW_USE_ACTIVE_UV;
 		}
 
-		if ((ob->mode & OB_MODE_SCULPT) && (ob == OBACT)) {
-			dm_draw_flag |= DM_DRAW_SKIP_HIDDEN;
+		if (ob == OBACT) {
+			if (ob->mode & OB_MODE_WEIGHT_PAINT) {
+				dm_draw_flag |= DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH | DM_DRAW_SKIP_HIDDEN;
+
+			}
+			else if (ob->mode & OB_MODE_SCULPT) {
+				dm_draw_flag |= DM_DRAW_SKIP_HIDDEN;
+			}
 		}