[Bf-blender-cvs] [16bcf7dc8e7] blender-v2.93-release: Fix T87417: crash when evaluating geo nodes without window manager

Pratik Borhade noreply at git.blender.org
Fri May 14 13:45:23 CEST 2021


Commit: 16bcf7dc8e70890b8ad75c84f8699a4507477668
Author: Pratik Borhade
Date:   Fri May 14 13:43:30 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB16bcf7dc8e70890b8ad75c84f8699a4507477668

Fix T87417: crash when evaluating geo nodes without window manager

Differential Revision: https://developer.blender.org/D11240

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

M	source/blender/modifiers/intern/MOD_nodes.cc

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

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 607b05d39b0..d808052e5f5 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -1074,8 +1074,11 @@ static void reset_tree_ui_storage(Span<const blender::nodes::NodeTreeRef *> tree
 
 static Vector<SpaceSpreadsheet *> find_spreadsheet_editors(Main *bmain)
 {
-  Vector<SpaceSpreadsheet *> spreadsheets;
   wmWindowManager *wm = (wmWindowManager *)bmain->wm.first;
+  if (wm == nullptr) {
+    return {};
+  }
+  Vector<SpaceSpreadsheet *> spreadsheets;
   LISTBASE_FOREACH (wmWindow *, window, &wm->windows) {
     bScreen *screen = BKE_workspace_active_screen_get(window->workspace_hook);
     LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {



More information about the Bf-blender-cvs mailing list