Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T48203: Pose-Mode overrides Alt-RMB menu select

Browse Source 
Now always use menu-select when using Alt-RMB
This commit is contained in:
Campbell Barton
2016-04-26 14:24:52 +10:00
parent 5b28fdb635
commit bd40ded9f6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_view3d/view3d_select.c
View File

@@ -1099,10 +1099,11 @@ 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 {
int temp, dist = 15;
ED_view3d_project_base(vc->ar, base);
@@ -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 {