Revision: 58864
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58864
Author: campbellbarton
Date: 2013-08-03 16:55:49 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
code cleanup: remove duplicate checks
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editface.c
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2013-08-03
16:37:23 UTC (rev 58863)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2013-08-03
16:55:49 UTC (rev 58864)
@@ -291,49 +291,37 @@
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;
- }
- mpoly++;
+ 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 @@
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;
- }
- mvert++;
+ 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
