[Bf-blender-cvs] [49311a73b8e] master: Fix: Crash in nodes modifier with missing node group

Hans Goudey noreply at git.blender.org
Wed Dec 15 22:00:27 CET 2021


Commit: 49311a73b8ec4bbbf8ed1c12677545ca39c277cf
Author: Hans Goudey
Date:   Wed Dec 15 15:00:20 2021 -0600
Branches: master
https://developer.blender.org/rB49311a73b8ec4bbbf8ed1c12677545ca39c277cf

Fix: Crash in nodes modifier with missing node group

We cannot depend on node->id being non-null for group nodes.

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

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 211257597cb..ec6cbeb43bf 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -280,7 +280,7 @@ static bool check_tree_for_time_node(const bNodeTree &tree,
     }
     if (node->type == NODE_GROUP) {
       const bNodeTree *sub_tree = reinterpret_cast<const bNodeTree *>(node->id);
-      if (check_tree_for_time_node(*sub_tree, r_checked_trees)) {
+      if (sub_tree && check_tree_for_time_node(*sub_tree, r_checked_trees)) {
         return true;
       }
     }



More information about the Bf-blender-cvs mailing list