[Bf-blender-cvs] [6b38c8a1ac1] master: Fix T70441: crash after deleting a material output node

Philipp Oeser noreply at git.blender.org
Wed Oct 2 14:03:01 CEST 2019


Commit: 6b38c8a1ac1bb480446d133a6704de1c5ecd1e28
Author: Philipp Oeser
Date:   Wed Oct 2 12:50:14 2019 +0200
Branches: master
https://developer.blender.org/rB6b38c8a1ac1bb480446d133a6704de1c5ecd1e28

Fix T70441: crash after deleting a material output node

Caused by 5c79f2d0fba7.
If no valid node_start is provided, we can just skip (e.g.
'ntree_shader_bump_branches' is not done then, but this is not
neccessary without a valid eevee output node anyways...).

Maniphest Tasks: T70441

Reviewed By: fclem

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

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

M	source/blender/blenkernel/intern/node.c

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

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 0ef35bd3d06..4ddfd879657 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -990,6 +990,10 @@ void nodeChainIterBackwards(const bNodeTree *ntree,
                             bool (*callback)(bNode *, bNode *, void *),
                             void *userdata)
 {
+  if (!node_start) {
+    return;
+  }
+
   /* Reset flag. */
   LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
     node->iter_flag = 0;



More information about the Bf-blender-cvs mailing list