blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Fix #116138: make hidden bones show up in Properties when selected in Outliner #117012

Open
Cedric-Hutchings wants to merge 1 commits from Cedric-Hutchings/blender:hidden-bones into main
pull from: Cedric-Hutchings/blender:hidden-bones
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 2 +9 -18
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/armature/armature_utils.cc
View File

@ -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;
}
}
}
/** \} */

20
source/blender/editors/space_outliner/outliner_select.cc
View File

@ -638,20 +638,18 @@ static void tree_element_ebone_activate(bContext *C,
EditBone *ebone = static_cast<EditBone *>(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)) {