kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: remove duplicate checks

Browse Source
This commit is contained in:
Campbell Barton 2013-08-03 16:55:49 +00:00
parent 4770848871
commit a75702b467
1 changed files with 40 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
source/blender/editors/mesh/editface.c
View File

@ -291,49 +291,37 @@ void paintface_deselect_all_visible(Object *ob, int action, bool flush_flags)
me = BKE_mesh_from_object(ob);
if (me == NULL) return;
if (action == SEL_INVERT) {
if (action == SEL_TOGGLE) {
action = SEL_SELECT;
mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
if ((mpoly->flag & ME_HIDE) == 0) {
mpoly->flag ^= ME_FACE_SEL;
if ((mpoly->flag & ME_HIDE) == 0 && mpoly->flag & ME_FACE_SEL) {
action = SEL_DESELECT;
break;
}
mpoly++;
}
}
else {
if (action == SEL_TOGGLE) {
action = SEL_SELECT;
mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
if ((mpoly->flag & ME_HIDE) == 0 && mpoly->flag & ME_FACE_SEL) {
action = SEL_DESELECT;
mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
if ((mpoly->flag & ME_HIDE) == 0) {
switch (action) {
case SEL_SELECT:
mpoly->flag |= ME_FACE_SEL;
break;
case SEL_DESELECT:
mpoly->flag &= ~ME_FACE_SEL;
break;
case SEL_INVERT:
mpoly->flag ^= ME_FACE_SEL;
break;
}
mpoly++;
}
}
mpoly = me->mpoly;
a = me->totpoly;
while (a--) {
if ((mpoly->flag & ME_HIDE) == 0) {
switch (action) {
case SEL_SELECT:
mpoly->flag |= ME_FACE_SEL;
break;
case SEL_DESELECT:
mpoly->flag &= ~ME_FACE_SEL;
break;
case SEL_INVERT:
mpoly->flag ^= ME_FACE_SEL;
break;
}
}
mpoly++;
}
mpoly++;
}
if (flush_flags) {
@ -557,49 +545,37 @@ void paintvert_deselect_all_visible(Object *ob, int action, bool flush_flags)
me = BKE_mesh_from_object(ob);
if (me == NULL) return;
if (action == SEL_INVERT) {
if (action == SEL_TOGGLE) {
action = SEL_SELECT;
mvert = me->mvert;
a = me->totvert;
while (a--) {
if ((mvert->flag & ME_HIDE) == 0) {
mvert->flag ^= SELECT;
if ((mvert->flag & ME_HIDE) == 0 && mvert->flag & SELECT) {
action = SEL_DESELECT;
break;
}
mvert++;
}
}
else {
if (action == SEL_TOGGLE) {
action = SEL_SELECT;
mvert = me->mvert;
a = me->totvert;
while (a--) {
if ((mvert->flag & ME_HIDE) == 0 && mvert->flag & SELECT) {
action = SEL_DESELECT;
mvert = me->mvert;
a = me->totvert;
while (a--) {
if ((mvert->flag & ME_HIDE) == 0) {
switch (action) {
case SEL_SELECT:
mvert->flag |= SELECT;
break;
case SEL_DESELECT:
mvert->flag &= ~SELECT;
break;
case SEL_INVERT:
mvert->flag ^= SELECT;
break;
}
mvert++;
}
}
mvert = me->mvert;
a = me->totvert;
while (a--) {
if ((mvert->flag & ME_HIDE) == 0) {
switch (action) {
case SEL_SELECT:
mvert->flag |= SELECT;
break;
case SEL_DESELECT:
mvert->flag &= ~SELECT;
break;
case SEL_INVERT:
mvert->flag ^= SELECT;
break;
}
}
mvert++;
}
mvert++;
}
/* handle mselect */