From 1fb9bb815a5df8ba3b4b2ebdaa4cad192fecd145 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 15 Jan 2014 00:25:50 +1100 Subject: Fix for own regression, editmode object selection (Ctrl+RMB) Wasn't working because of editmode override (which uses regular object selection in editmode) --- source/blender/editors/space_view3d/view3d_select.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d') 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]; -- cgit v1.2.3