diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-11-06 12:45:39 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-11-06 12:45:39 +0300 |
commit | dae004557a3859e7b20fcc8a555b22c87b9cee2a (patch) | |
tree | 78b1f63aea7e2087bfe2f2d446d637cdd0997b6b /source/blender/editors/space_outliner/outliner_sync.c | |
parent | 0573f86587d598e5fbe5b8fdc413b5a113443fe9 (diff) | |
parent | 28e703b0a104f8c8c64dee835d9fd3e657ac86cf (diff) |
Merge branch 'blender-v2.91-release' into master
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_sync.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_sync.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_sync.c b/source/blender/editors/space_outliner/outliner_sync.c index e1a96da1c91..4591a545783 100644 --- a/source/blender/editors/space_outliner/outliner_sync.c +++ b/source/blender/editors/space_outliner/outliner_sync.c @@ -253,11 +253,13 @@ static void outliner_select_sync_to_edit_bone(ViewLayer *view_layer, if (EBONE_SELECTABLE(arm, ebone)) { if (tselem->flag & TSE_SELECTED) { - ebone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL); - + ED_armature_ebone_select_set(ebone, true); add_selected_item(selected_ebones, ebone); } else if (!is_edit_bone_selected(selected_ebones, ebone)) { + /* Dont flush to parent bone tip, synced selection is iterating the whole tree so deselecting + * potential children with 'ED_armature_ebone_select_set(ebone, false)' would leave own tip + * deselected. */ ebone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL); } } |