From ba4d215139c09dd5f9012abdb4399e9e16920c3a Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Thu, 17 May 2018 08:54:40 +0200 Subject: T55090: Proxy bones were not selectable - Implemented custom selection in pose mode overriding the rest. This selection mode is only done for bone selection right now --- source/blender/draw/intern/draw_manager.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'source/blender/draw/intern/draw_manager.c') diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 2ccbec788c0..3e7790b421f 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1605,12 +1605,12 @@ void DRW_draw_select_loop( obedit_mode = CTX_MODE_EDIT_ARMATURE; } } - bool use_bone_selection_overlay = false; if (v3d->overlay.flag &= V3D_OVERLAY_BONE_SELECTION) { if (!(v3d->flag2 &= V3D_RENDER_OVERRIDE)) { Object *obpose = OBPOSE_FROM_OBACT(obact); if (obpose) { - use_bone_selection_overlay = true; + use_obedit = true; + obedit_mode = CTX_MODE_POSE; } } } @@ -1628,17 +1628,8 @@ void DRW_draw_select_loop( drw_engines_enable_from_mode(obedit_mode); } else { - /* when in pose mode and overlays enable and bone selection overlay - active, switch order as the bone selection must have more precedence - than the rest of the scene */ - if (use_bone_selection_overlay) { - drw_engines_enable_from_object_mode(); - drw_engines_enable_basic(); - } - else { - drw_engines_enable_basic(); - drw_engines_enable_from_object_mode(); - } + drw_engines_enable_basic(); + drw_engines_enable_from_object_mode(); } /* Setup viewport */ -- cgit v1.2.3