diff options
author | Hans Goudey <h.goudey@me.com> | 2021-11-22 16:47:02 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-11-22 16:47:02 +0300 |
commit | 77ddc6e3500e4d736195202438df50190be85e5a (patch) | |
tree | fe3d9e0d15ee873f4f4f34e8d2e75e4ee5541692 /source/blender/editors/interface | |
parent | 7e8f9213e9398a048f1f209cb47bae1905327059 (diff) |
Fix T93250: Crash in spreadsheet tree view after recent commit
It seems that update_from_old assumed there would be an old
tree view available in the old block. This works for the asset browser
because the tree is always drawn, but for the spreadsheet that depends
on having an active object, which isn't necessarily always true.
Differential Revision: https://developer.blender.org/D13301
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/tree_view.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/interface/tree_view.cc b/source/blender/editors/interface/tree_view.cc index e9d68a734d2..5fcf78dd565 100644 --- a/source/blender/editors/interface/tree_view.cc +++ b/source/blender/editors/interface/tree_view.cc @@ -111,7 +111,10 @@ void AbstractTreeView::update_from_old(uiBlock &new_block) uiTreeViewHandle *old_view_handle = ui_block_view_find_matching_in_old_block( &new_block, reinterpret_cast<uiTreeViewHandle *>(this)); - BLI_assert(old_view_handle); + if (old_view_handle == nullptr) { + is_reconstructed_ = true; + return; + } AbstractTreeView &old_view = reinterpret_cast<AbstractTreeView &>(*old_view_handle); |