diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-26 07:24:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-26 07:24:52 +0300 |
| commit | bd40ded9f659e0bd34d4843b8c5882307274be82 (patch) | |
| tree | 61356ec93f412633a9fe58dacad7da2e545ca981 | |
| parent | 5b28fdb6359cba7d80bc51d9a43b36f164cafbab (diff) | |
Fix T48203: Pose-Mode overrides Alt-RMB menu select
Now always use menu-select when using Alt-RMB
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 18cb9fb728d..e4cc552df84 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1099,8 +1099,9 @@ static Base *object_mouse_select_menu(bContext *C, ViewContext *vc, unsigned int int a; for (a = 0; a < hits; a++) { /* index was converted */ - if (base->selcol == buffer[(4 * a) + 3]) + if (base->selcol == (buffer[(4 * a) + 3] & ~0xFFFF0000)) { ok = true; + } } } else { @@ -1468,7 +1469,7 @@ static bool ed_object_select_pick( const bool has_bones = selectbuffer_has_bones(buffer, hits); /* note; shift+alt goes to group-flush-selecting */ - if (has_bones == 0 && enumerate) { + if (enumerate) { basact = object_mouse_select_menu(C, &vc, buffer, hits, mval, toggle); } else { |