[Bf-blender-cvs] [57eb853] master: Fix crash (segfault) in node editor.
Bastien Montagne
noreply at git.blender.org
Fri Apr 29 17:40:12 CEST 2016
Commit: 57eb8539fc5cab771828143dbfd100013b18db6e
Author: Bastien Montagne
Date: Fri Apr 29 17:37:00 2016 +0200
Branches: master
https://developer.blender.org/rB57eb8539fc5cab771828143dbfd100013b18db6e
Fix crash (segfault) in node editor.
In some cases, we can have nodegroups without attached nodetree, this case is checked
in top `node_group_has_output()` entry point, but not in recursive `node_group_has_output_dfs()`.
Issue appeared after rB42824f4403db3a35, presumably because check on node flag itself
was skipping that case, which is no more possible when using ID tags.
Reported by sebastian_k over IRC, thanks.
===================================================================
M source/blender/editors/space_node/node_relationships.c
===================================================================
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index 07e79c5..4abc7f5 100644
--- a/source/blender/editors/space_node/node_relationships.c
+++ b/source/blender/editors/space_node/node_relationships.c
@@ -107,7 +107,7 @@ static bool node_group_has_output_dfs(bNode *node)
current_node = current_node->next)
{
if (current_node->type == NODE_GROUP) {
- if (node_group_has_output_dfs(current_node)) {
+ if (current_node->id && node_group_has_output_dfs(current_node)) {
return true;
}
}
More information about the Bf-blender-cvs
mailing list