From a46290aaa87dfcb9674cb108fc58e00ac0155f46 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Nov 2018 15:28:59 +1100 Subject: [PATCH] Fix object selection in edit-mode Ctrl-RMB in edit-mode is needed for setting vertex parent. --- source/blender/editors/space_view3d/view3d_select.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index aafe931ff07..30dbaed1d0f 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1647,7 +1647,8 @@ static bool ed_object_select_pick( // TIMEIT_START(select_time); /* if objects have posemode set, the bones are in the same selection buffer */ - const eV3DSelectObjectFilter select_filter = ED_view3d_select_filter_from_mode(scene, vc.obact); + const eV3DSelectObjectFilter select_filter = ( + (object == false) ? ED_view3d_select_filter_from_mode(scene, vc.obact) : VIEW3D_SELECT_FILTER_NOP); hits = mixed_bones_object_selectbuffer( &vc, buffer, mval, true, enumerate, select_filter,