diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 40 |
2 files changed, 34 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 0ef92ca75a3..7d728aad9cd 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -3774,8 +3774,10 @@ void BKE_mesh_do_versions_cd_flag_init(Mesh *mesh) void BKE_mesh_mselect_clear(Mesh *me) { - MEM_freeN(me->mselect); - me->mselect = NULL; + if (me->mselect) { + MEM_freeN(me->mselect); + me->mselect = NULL; + } me->totselect = 0; } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 2c67802d949..1fee3dcb0d0 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -1942,20 +1942,25 @@ static void drawlattice(Scene *scene, View3D *v3d, Object *ob) /* ***************** ******************** */ /* draw callback */ + +typedef struct drawDMVertSel_userData { + MVert *mvert; + int active; + unsigned char *col[3]; /* (base, sel, act) */ + char sel_prev; +} drawDMVertSel_userData; + static void drawSelectedVertices__mapFunc(void *userData, int index, const float co[3], const float UNUSED(no_f[3]), const short UNUSED(no_s[3])) { - MVert *mv = &((MVert *)userData)[index]; + drawDMVertSel_userData *data = userData; + MVert *mv = &data->mvert[index]; if (!(mv->flag & ME_HIDE)) { - const char sel = mv->flag & SELECT; - - /* TODO define selected color */ - if (sel) { - glColor3f(1.0f, 1.0f, 0.0f); - } - else { - glColor3f(0.0f, 0.0f, 0.0f); + const char sel = (index == data->active) ? 2 : (mv->flag & SELECT); + if (sel != data->sel_prev) { + glColor3ubv(data->col[sel]); + data->sel_prev = sel; } glVertex3fv(co); @@ -1964,8 +1969,23 @@ static void drawSelectedVertices__mapFunc(void *userData, int index, const float static void drawSelectedVertices(DerivedMesh *dm, Mesh *me) { + drawDMVertSel_userData data; + + /* TODO define selected color */ + unsigned char base_col[3] = {0x0, 0x0, 0x0}; + unsigned char sel_col[3] = {0xd8, 0xd8, 0x0}; + unsigned char act_col[3] = {0xff, 0xff, 0xff}; + + data.mvert = me->mvert; + data.active = BKE_mesh_mselect_active_get(me, ME_VSEL); + data.sel_prev = 0xff; + + data.col[0] = base_col; + data.col[1] = sel_col; + data.col[2] = act_col; + glBegin(GL_POINTS); - dm->foreachMappedVert(dm, drawSelectedVertices__mapFunc, me->mvert); + dm->foreachMappedVert(dm, drawSelectedVertices__mapFunc, &data); glEnd(); } |