From 229f1eb610d84c31a18ae4dff8f404ac562624a2 Mon Sep 17 00:00:00 2001 From: Cedric Hutchings Date: Wed, 10 Jan 2024 23:21:30 -0700 Subject: [PATCH] Fix #116138: make hidden bones show up in Properties when selected in Outliner --- .../editors/armature/armature_utils.cc | 7 ------- .../editors/space_outliner/outliner_select.cc | 20 +++++++++---------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/source/blender/editors/armature/armature_utils.cc b/source/blender/editors/armature/armature_utils.cc index b78be20b4f2..1d3a4412e62 100644 --- a/source/blender/editors/armature/armature_utils.cc +++ b/source/blender/editors/armature/armature_utils.cc @@ -65,13 +65,6 @@ void ED_armature_edit_sync_selection(ListBase *edbo) void ED_armature_edit_validate_active(bArmature *arm) { - EditBone *ebone = arm->act_edbone; - - if (ebone) { - if (ebone->flag & BONE_HIDDEN_A) { - arm->act_edbone = nullptr; - } - } } /** \} */ diff --git a/source/blender/editors/space_outliner/outliner_select.cc b/source/blender/editors/space_outliner/outliner_select.cc index 16b2245e916..7a930f90069 100644 --- a/source/blender/editors/space_outliner/outliner_select.cc +++ b/source/blender/editors/space_outliner/outliner_select.cc @@ -638,20 +638,18 @@ static void tree_element_ebone_activate(bContext *C, EditBone *ebone = static_cast(te->directdata); if (set == OL_SETSEL_NORMAL) { - if (!(ebone->flag & BONE_HIDDEN_A)) { - uint bases_len = 0; + uint bases_len = 0; - ObjectsInModeParams ob_params{}; - ob_params.object_mode = OB_MODE_EDIT; - ob_params.no_dup_data = true; + ObjectsInModeParams ob_params{}; + ob_params.object_mode = OB_MODE_EDIT; + ob_params.no_dup_data = true; - Base **bases = BKE_view_layer_array_from_bases_in_mode_params( - scene, view_layer, nullptr, &bases_len, &ob_params); - ED_armature_edit_deselect_all_multi_ex(bases, bases_len); - MEM_freeN(bases); + Base **bases = BKE_view_layer_array_from_bases_in_mode_params( + scene, view_layer, nullptr, &bases_len, &ob_params); + ED_armature_edit_deselect_all_multi_ex(bases, bases_len); + MEM_freeN(bases); - tree_element_active_ebone__sel(C, arm, ebone, true); - } + tree_element_active_ebone__sel(C, arm, ebone, true); } else if (set == OL_SETSEL_EXTEND) { if (!(ebone->flag & BONE_HIDDEN_A)) { -- 2.30.2