diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-27 17:03:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-27 17:03:33 +0400 |
| commit | 57ae0f7680918f7a1971fb8d56a02cd06ee8b666 (patch) | |
| tree | e9ac80324a92e091a956f805fe7a6fb8e66186e0 /source/blender | |
| parent | 083115c5e790d5c6e87a7a4a42daea70da1ded1b (diff) | |
modification to r57023, use active color but only draw face-stipple when selected. (active-unselected isn't in common usage for mesh editmode).
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 54231808e75..ba2949fbbec 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2369,10 +2369,7 @@ static DMDrawOption draw_dm_faces_sel__setDrawOptions(void *userData, int index) if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { if (efa == data->efa_act) { - if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) - glColor4ubv(data->cols[1]); - else - glColor4ubv(data->cols[2]); + glColor4ubv(data->cols[2]); return DM_DRAW_OPTION_STIPPLE; } else { @@ -2968,7 +2965,7 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d, { Mesh *me = ob->data; - BMFace *efa_act = BM_active_face_get(em->bm, false, false); /* annoying but active faces is stored differently */ + BMFace *efa_act = BM_active_face_get(em->bm, false, true); /* annoying but active faces is stored differently */ BMEdge *eed_act = NULL; BMVert *eve_act = NULL; |