diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 12:26:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 12:26:55 +0400 |
| commit | 9742a6f6cb053ff45060f4bb5f5fa96084b7f5b5 (patch) | |
| tree | d5b1262326e4640fa1a60b8602955e71750aee1f /source/blender/editors | |
| parent | 519ee151a325fdb32e7bb34352ef31940d422fc5 (diff) | |
Resolve T38899: changes to Ctrl+Selectmouse conflict with LMB select
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index b2b723524d1..47f30e3e279 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]; |