[Bf-blender-cvs] [919ec85] blender-v2.73-release: Fix T42977: Weights failed to display in Wireframe mode when using Face Select

[julianeisel]

Commit: 919ec85f6c0109e1aa74ffa338f3f5cf0d151fac
Author: julianeisel
Date:   Fri Dec 26 16:53:40 2014 +0100
Branches: blender-v2.73-release
https://developer.blender.org/rB919ec85f6c0109e1aa74ffa338f3f5cf0d151fac

Fix T42977: Weights failed to display in Wireframe mode when using Face Select

D948, reviewed by @mont29 (thanks for that)

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

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

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

diff --git a/source/blender/editors/space_view3d/drawobject.c 
b/source/blender/editors/space_view3d/drawobject.c
index a63b166..6c2d9db 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs