[Bf-blender-cvs] [a86f657692a] master: Fix T104233: crash when deleting a group node that is displayed by other editor

Iliya Katueshenock noreply at git.blender.org
Mon Feb 6 16:20:42 CET 2023


Commit: a86f657692a157308e5f58a2eb4f82ab37d4f69b
Author: Iliya Katueshenock
Date:   Mon Feb 6 16:16:12 2023 +0100
Branches: master
https://developer.blender.org/rBa86f657692a157308e5f58a2eb4f82ab37d4f69b

Fix T104233: crash when deleting a group node that is displayed by other editor

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

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

M	source/blender/nodes/intern/geometry_nodes_log.cc

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

diff --git a/source/blender/nodes/intern/geometry_nodes_log.cc b/source/blender/nodes/intern/geometry_nodes_log.cc
index 919159a31de..a57bfad7a79 100644
--- a/source/blender/nodes/intern/geometry_nodes_log.cc
+++ b/source/blender/nodes/intern/geometry_nodes_log.cc
@@ -526,6 +526,11 @@ std::optional<ComputeContextHash> GeoModifierLog::get_compute_context_hash_for_n
   for (const int i : tree_path.index_range().drop_back(1)) {
     /* The tree path contains the name of the node but not its ID. */
     const bNode *node = nodeFindNodebyName(tree_path[i]->nodetree, tree_path[i + 1]->node_name);
+    if (node == nullptr) {
+      /* The current tree path is invalid, probably because some parent group node has been
+       * deleted. */
+      return std::nullopt;
+    }
     compute_context_builder.push<bke::NodeGroupComputeContext>(*node);
   }
   return compute_context_builder.hash();



More information about the Bf-blender-cvs mailing list