diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 20:30:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 20:30:56 +0400 |
| commit | 330da356dab13db7d094064a00d56347b1d53e79 (patch) | |
| tree | d80a91bb1d2122b07cedb9d11836cf7ab80affa8 /source/blender/editors/space_view3d/view3d_select.c | |
| parent | 7b2101ace983cc9d7112dd45a8b264b51657dea9 (diff) | |
| parent | 167999304ea0053532e84aff0c7fd0d1ce002a6c (diff) | |
svn merge ^/trunk/blender -r43524:43530
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 38956cd9401..b4217441640 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -265,7 +265,9 @@ static int view3d_selectable_data(bContext *C) if (ob->mode & OB_MODE_SCULPT) { return 0; } - if (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT) && !paint_facesel_test(ob) && !paint_vertsel_test(ob)) { + if ((ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)) && + !paint_facesel_test(ob) && !paint_vertsel_test(ob)) + { return 0; } } |