diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-04 14:28:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-04 14:28:21 +0300 |
| commit | ca606bf55165881896467f6a5c09e5870c847fbb (patch) | |
| tree | e64b693bc0b0b9bcfaa17e687442c02c0791928e /source/blender/editors/space_view3d/view3d_select.c | |
| parent | 0dff6b2b4bd74107f3736617d0572d0a47d7383f (diff) | |
| parent | 164f40c50a05ad4e1696cdd0f55de96c210a125a (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 2c8ea396a99..e23dd48b8b9 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -2112,7 +2112,7 @@ static bool ed_object_select_pick(bContext *C, if (hits > 0) { /* note: bundles are handling in the same way as bones */ - const bool has_bones = selectbuffer_has_bones(buffer, hits); + const bool has_bones = object ? false : selectbuffer_has_bones(buffer, hits); /* note; shift+alt goes to group-flush-selecting */ if (enumerate) { |