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

Fix #89479: Unable to select hierarchies of multiple objects from outliner #104737

Merged
Pratik Borhade merged 11 commits from PratikPB2123/blender:T89479-select-multi-hierarchies into main 2023-08-17 13:23:52 +02:00
Conversation 29 Commits 11 Files Changed 1 +7 -14
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9b272a44e2 - Show all commits

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

@ -241,20 +241,8 @@ static void tree_element_viewlayer_activate(bContext *C, TreeElement *te)
static void do_outliner_object_select_recursive(const Scene *scene,
ViewLayer *view_layer,
Object *ob_parent,
ListBase *lb,
const bool sync_select,
bool select)
{
if (!sync_select) {
tree_iterator::all(*lb, [&](TreeElement *te) {
TreeStoreElem *tselem = TREESTORE(te);
if ((tselem->type == TSE_SOME_ID) && (te->idcode == ID_OB)) {
tselem->flag |= TSE_SELECTED;
}
});
return;
}
BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
Object *ob = base->object;
@ -397,7 +385,7 @@ static void tree_element_object_activate(bContext *C,
if (recursive) {
/* Recursive select/deselect for Object hierarchies */
do_outliner_object_select_recursive(
scene, view_layer, ob, NULL, true, (base->flag & BASE_SELECTED) != 0);
scene, view_layer, ob, (base->flag & BASE_SELECTED) != 0);
}
if (set != OL_SETSEL_NONE) {
@ -1438,7 +1426,12 @@ static void do_outliner_item_activate_tree_element(bContext *C,
}
else if (recursive && !(space_outliner->flag & SO_SYNC_SELECT)) {
/* Selection of child objects in hierarchy when sync-selection is OFF. */
do_outliner_object_select_recursive(NULL, NULL, NULL, &te->subtree, false, true);
tree_iterator::all(te->subtree, [&](TreeElement *te) {
TreeStoreElem *tselem = TREESTORE(te);
if ((tselem->type == TSE_SOME_ID) && (te->idcode == ID_OB)) {
tselem->flag |= TSE_SELECTED;
}
});
}
if (tselem->type == TSE_SOME_ID) { /* The lib blocks. */