[Bf-blender-cvs] [77ddc6e3500] master: Fix T93250: Crash in spreadsheet tree view after recent commit

Hans Goudey noreply at git.blender.org
Mon Nov 22 14:47:12 CET 2021


Commit: 77ddc6e3500e4d736195202438df50190be85e5a
Author: Hans Goudey
Date:   Mon Nov 22 08:47:02 2021 -0500
Branches: master
https://developer.blender.org/rB77ddc6e3500e4d736195202438df50190be85e5a

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

===================================================================

M	source/blender/editors/interface/tree_view.cc

===================================================================

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);



More information about the Bf-blender-cvs mailing list