[Bf-blender-cvs] [bd40ded] master: Fix T48203: Pose-Mode overrides Alt-RMB menu select

[Campbell Barton]

Commit: bd40ded9f659e0bd34d4843b8c5882307274be82
Author: Campbell Barton
Date:   Tue Apr 26 14:24:52 2016 +1000
Branches: master
https://developer.blender.org/rBbd40ded9f659e0bd34d4843b8c5882307274be82

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

Now always use menu-select when using Alt-RMB

===================================================================

M	source/blender/editors/space_view3d/view3d_select.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 18cb9fb..e4cc552 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 {