Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T85976: Outliner crash deleting collection with multiple windows

Browse Source
This commit is contained in:
Campbell Barton
2021-02-26 00:09:39 +11:00
parent cccdd6626d
commit ae581f9445
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,7 +395,7 @@ static SpaceLink *outliner_duplicate(SpaceLink *sl)
return (SpaceLink *)space_outliner_new;
}
static void outliner_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_id, ID *new_id)
static void outliner_id_remap(ScrArea *area, SpaceLink *slink, ID *old_id, ID *new_id)
{
SpaceOutliner *space_outliner = (SpaceOutliner *)slink;
@@ -427,6 +427,13 @@ static void outliner_id_remap(ScrArea *UNUSED(area), SpaceLink *slink, ID *old_i
/* rebuild hash table, because it depends on ids too */
/* postpone a full rebuild because this can be called many times on-free */
space_outliner->storeflag |= SO_TREESTORE_REBUILD;
if (new_id == NULL) {
/* Redraw is needed when removing data for multiple outlines show the same data.
* without this, the stale data won't get fully flushed when this outliner
* is not the active outliner the user is interacting with. See T85976. */
ED_area_tag_redraw(area);
}
}
}
}