diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-02-11 10:48:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-02-11 10:48:28 +0300 |
| commit | 0d71ea54d0d36a485955368a3324636f824cc361 (patch) | |
| tree | 831fdb529f93674225682751f33767c173870194 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 5b2d0b0fb423d8cadbc992fbfaa0e3cfdfa7efbb (diff) | |
Fix T47389: WPaint + texture entirely transparent
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 039cc747a92..345e47940d5 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; + } } |