diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-26 09:05:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-26 09:05:29 +0400 |
commit | 4a61df9c95d48c0854d49869eac2d3dc0453b7f4 (patch) | |
tree | 26b919382136e8c022cbb4fbb106ca103c2eaeb6 /source/blender/editors/space_view3d/view3d_select.c | |
parent | 081a3412a94705e5a95b08d7b41c1bbb879290d8 (diff) |
Fix T38837: Ctrl+RMB can't select posemode
This used to work (unintentionally), now check for paint-select
modes as well as editmode for ctrl+rmb to force object selection.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 85987669d8a..b2b723524d1 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -2219,7 +2219,9 @@ static int view3d_select_exec(bContext *C, wmOperator *op) bool toggle = RNA_boolean_get(op->ptr, "toggle"); bool center = RNA_boolean_get(op->ptr, "center"); bool enumerate = RNA_boolean_get(op->ptr, "enumerate"); - bool object = (RNA_boolean_get(op->ptr, "object") && obedit); /* only force object select for editmode */ + /* 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 retval = false; int location[2]; |