diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-14 17:25:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-14 17:28:55 +0400 |
| commit | 1fb9bb815a5df8ba3b4b2ebdaa4cad192fecd145 (patch) | |
| tree | 29c8a6a504aa81fb9449746bd3e55a2a7adff90b /source/blender/editors/space_view3d | |
| parent | ca2a14491e145de400a0a0f2424ba77b281d0372 (diff) | |
Fix for own regression, editmode object selection (Ctrl+RMB)
Wasn't working because of editmode override (which uses regular object selection in editmode)
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index e56cd1e9f5f..d18fb452022 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -2222,7 +2222,7 @@ 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"); + bool object = (RNA_boolean_get(op->ptr, "object") && obedit); /* only force object select for editmode */ bool retval = false; int location[2]; |