diff options
author | julianeisel <julian_eisel@web.de> | 2014-12-26 18:53:40 +0300 |
---|---|---|
committer | julianeisel <julian_eisel@web.de> | 2014-12-26 18:53:40 +0300 |
commit | 6339ba1ee2b06174fa6e5157999b59e4e093ff1f (patch) | |
tree | 6edfa18a48b19e3af293c27e06d9f10037b3c0cb /source | |
parent | da78d2d74255dd5a6e84da5e023e119e27a4e6d8 (diff) |
Fix T42977: Weights failed to display in Wireframe mode when using Face Select
D948, reviewed by @mont29 (thanks for that)
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index a63b166969e..6c2d9dbe90a 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2952,21 +2952,23 @@ static void draw_em_fancy_edges(BMEditMesh *em, Scene *scene, View3D *v3d, if (!sel_only) wireCol[3] = 255; } - if (ts->selectmode == SCE_SELECT_FACE) { - draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act); - } - else if ((me->drawflag & ME_DRAWEDGES) || (ts->selectmode & SCE_SELECT_EDGE)) { + if ((me->drawflag & ME_DRAWEDGES) || (ts->selectmode & SCE_SELECT_EDGE)) { if (cageDM->drawMappedEdgesInterp && ((ts->selectmode & SCE_SELECT_VERTEX) || (me->drawflag & ME_DRAWEIGHT))) { - glShadeModel(GL_SMOOTH); if (draw_dm_edges_weight_check(me, v3d)) { + glShadeModel(GL_SMOOTH); draw_dm_edges_weight_interp(em, cageDM, ts->weightuser); + glShadeModel(GL_FLAT); + } + else if (ts->selectmode == SCE_SELECT_FACE) { + draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act); } else { + glShadeModel(GL_SMOOTH); draw_dm_edges_sel_interp(em, cageDM, wireCol, selCol); + glShadeModel(GL_FLAT); } - glShadeModel(GL_FLAT); } else { draw_dm_edges_sel(em, cageDM, wireCol, selCol, actCol, eed_act); |