diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 02:00:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 02:00:55 +0400 |
| commit | 7f34653f59ad3f7bed75eb9a36aa6ed928eef181 (patch) | |
| tree | 999e7d6a234780e854bcdc20f440a9b7f1ec13b5 /source/blender/editors/space_view3d/view3d_select.c | |
| parent | 67f1e83508ac1312b6b41093cb1946363ce3d0fd (diff) | |
style cleanup: + some warning fixes, also remove unused metaelem extern.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 93cf656dea4..3d1156c8ad1 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -816,12 +816,11 @@ int do_paintvert_box_select(ViewContext *vc, rcti *rect, int select, int extend) } mvert= me->mvert; - for (a=1; a<=me->totvert; a++, mvert++) { + for (a = 1; a <= me->totvert; a++, mvert++) { if (selar[a]) { - if (mvert->flag & ME_HIDE); - else { - if (select) mvert->flag |= SELECT; - else mvert->flag &= ~SELECT; + if ((mvert->flag & ME_HIDE) == 0) { + if (select) mvert->flag |= SELECT; + else mvert->flag &= ~SELECT; } } } @@ -1595,7 +1594,7 @@ static int mouse_select(bContext *C, const int mval[2], short extend, short obce WM_event_add_notifier(C, NC_OBJECT|ND_BONE_ACTIVE, basact->object); /* in weightpaint, we use selected bone to select vertexgroup, so no switch to new active object */ - if (BASACT && BASACT->object->mode & OB_MODE_WEIGHT_PAINT) { + if (BASACT && (BASACT->object->mode & OB_MODE_WEIGHT_PAINT)) { /* prevent activating */ basact= NULL; } |