Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-04-29 18:37:00 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-04-29 18:37:00 +0300
commit57eb8539fc5cab771828143dbfd100013b18db6e (patch)
treea3a3c45a85564ddab085a716b1e047b23366da0f /source/blender/editors/space_node
parent467e12514e60b4130cd0a33b59f53aa4cf7056b6 (diff)
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.
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r--source/blender/editors/space_node/node_relationships.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index 07e79c5a59c..4abc7f5e71b 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;
}
}