[Bf-blender-cvs] [9742a6f] master: Resolve T38899: changes to Ctrl+Selectmouse conflict with LMB select

[Campbell Barton]

Commit: 9742a6f6cb053ff45060f4bb5f5fa96084b7f5b5
Author: Campbell Barton
Date:   Sat Mar 1 19:26:55 2014 +1100
https://developer.blender.org/rB9742a6f6cb053ff45060f4bb5f5fa96084b7f5b5

Resolve T38899: changes to Ctrl+Selectmouse conflict with LMB select

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

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 b2b7235..47f30e3 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -2221,7 +2221,12 @@ static int view3d_select_exec(bContext *C, wmOperator *op)
 	bool enumerate = RNA_boolean_get(op->ptr, "enumerate");
 	/* only force object select for editmode to support vertex parenting,
 	 * or paint-select to allow pose bone select with vert/face select */
-	bool object = (RNA_boolean_get(op->ptr, "object") && (obedit || BKE_paint_select_elem_test(obact)));
+	bool object = (RNA_boolean_get(op->ptr, "object") &&
+	               (obedit ||
+	                BKE_paint_select_elem_test(obact) ||
+	                /* so its possible to select bones in weightpaint mode (LMB select) */
+	                (obact && (obact->mode & OB_MODE_WEIGHT_PAINT) && BKE_object_pose_armature_get(obact))));
+
 	bool retval = false;
 	int location[2];