griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T75471: Outliner: crash selecting modifier objects/targets that are in a excluded collection

Browse Source 
There is no garuantee 'outliner_find_id()' can find those corresponding
TreeElements, safeguard against failure now.

note: not sure why this was no problem in Release builds? (could only
reproduce crashes in Debug builds...)

Maniphest Tasks: T75471

Differential Revision: https://developer.blender.org/D7365
This commit is contained in:
Philipp Oeser
2020-04-07 12:59:46 +02:00
parent 5e0465e4ec
commit 3a65397473
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,6 +312,7 @@ static eOLDrawState tree_element_set_active_object(bContext *C,
Scene *sce;
Base *base;
Object *ob = NULL;
TreeElement *te_ob = NULL;
/* if id is not object, we search back */
if (te->idcode == ID_OB) {
@@ -355,8 +356,12 @@ static eOLDrawState tree_element_set_active_object(bContext *C,
}
}
parent_tselem = TREESTORE(outliner_find_id(soops, &soops->tree, (ID *)ob));
if (base) {
te_ob = outliner_find_id(soops, &soops->tree, (ID *)ob);
if (te_ob != NULL) {
parent_tselem = TREESTORE(te_ob);
}
if (!ELEM(NULL, parent_tselem, base)) {
if (set == OL_SETSEL_EXTEND) {
/* swap select */
if (base->flag & BASE_SELECTED) {