diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-03 20:55:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-03 20:55:49 +0400 |
| commit | a75702b4672b43ebade5b36899c08c61362eeac0 (patch) | |
| tree | ba81029b3dcf42c7f4939693cd566356039d8be4 /source/blender/editors/mesh/editface.c | |
| parent | 4770848871c9b19caf113f250a0346b4954a8c2e (diff) | |
code cleanup: remove duplicate checks
Diffstat (limited to 'source/blender/editors/mesh/editface.c')
| -rw-r--r-- | source/blender/editors/mesh/editface.c | 108 |
1 files changed, 42 insertions, 66 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index db5635d6ea3..902906fcf8a 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -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; - 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 = 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; - 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 = 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 */ |