blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Outliner: Fix selection extend not toggling 

An unintentional side-effect of rBfe7528ee919b was that when
extend-selecting a selected element in the outliner, it would be
deselected and activated rather than selected and activated.

This commit restores the expected toggling behavior. Consistent behavior
for extend-selecting child datablocks is not resolvable without a much
larger cleanup of the outliner select functions.
This commit is contained in:
Nathan Craddock 2020-05-01 12:52:32 -06:00
parent 716638458d
commit b52b5e15af
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_outliner/outliner_select.c
View File

@ -357,20 +357,24 @@ static eOLDrawState tree_element_set_active_object(bContext *C,
}
te_ob = outliner_find_id(soops, &soops->tree, (ID *)ob);
if (te_ob != NULL) {
if (te_ob != NULL && te_ob != te) {
parent_tselem = TREESTORE(te_ob);
}
if (!ELEM(NULL, parent_tselem, base)) {
if (base) {
if (set == OL_SETSEL_EXTEND) {
/* swap select */
if (base->flag & BASE_SELECTED) {
ED_object_base_select(base, BA_DESELECT);
parent_tselem->flag &= ~TSE_SELECTED;
if (parent_tselem) {
parent_tselem->flag &= ~TSE_SELECTED;
}
}
else {
ED_object_base_select(base, BA_SELECT);
parent_tselem->flag |= TSE_SELECTED;
if (parent_tselem) {
parent_tselem->flag |= TSE_SELECTED;
}
}
}
else {
@ -386,7 +390,9 @@ static eOLDrawState tree_element_set_active_object(bContext *C,
BKE_view_layer_base_deselect_all(view_layer);
}
ED_object_base_select(base, BA_SELECT);
parent_tselem->flag |= TSE_SELECTED;
if (parent_tselem) {
parent_tselem->flag |= TSE_SELECTED;
}
}
if (recursive) {