From 84b021e90f266bc31c6c8379ca4804d719e27b93 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 28 Sep 2004 11:19:57 +0000 Subject: [PATCH] Two small fixes thanks to test: - backbuf draw vertices did still use pointsize 1.0, making them hard to select - wire frontbuf draw on select used un-initialized color --- source/blender/src/drawobject.c | 4 ++++ source/blender/src/editmesh_mods.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 1738205d827..2a067e6342c 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -4337,6 +4337,8 @@ static void bbs_mesh_verts(Object *ob, int offset) EditVert *eve; int a= offset; + glPointSize( BIF_GetThemeValuef(TH_VERTEX_SIZE) ); + bglBegin(GL_POINTS); for(eve= G.editMesh->verts.first; eve; eve= eve->next, a++) { if(eve->h==0) { @@ -4345,6 +4347,8 @@ static void bbs_mesh_verts(Object *ob, int offset) } } bglEnd(); + + glPointSize(1.0); } /* two options, edgecolors or black */ diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index 72b5a6d47f1..28e5d31235d 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -668,14 +668,14 @@ static void unified_select_draw(EditVert *eve, EditEdge *eed, EditFace *efa) if(dl) dlm= dl->mesh; if( (me->flag & ME_OPT_EDGES) && (me->flag & ME_SUBSURF) && me->subdiv) optimal= 1; + if(eed->f & SELECT) BIF_ThemeColor(TH_EDGE_SELECT); + else BIF_ThemeColor(TH_WIRE); + if(dlm && optimal) { MEdge *medge= dlm->medge; MVert *mvert= dlm->mvert; int b; - if(eed->f & SELECT) BIF_ThemeColor(TH_EDGE_SELECT); - else BIF_ThemeColor(TH_WIRE); - glBegin(GL_LINES); for (b=0; btotedge; b++, medge++) { if(medge->flag & ME_EDGEDRAW) {