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:
authorLukas Toenne <lukas.toenne@googlemail.com>2013-06-10 21:48:41 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2013-06-10 21:48:41 +0400
commit5183ba74a84d1d41561f233bc1679d5a4fd422cb (patch)
tree22cb1620416c171d328fc5bdccccef55574dc6cc /source/blender/nodes/intern
parentbfbac9b4489e9dedd5a0988e7eda0e2a5cbc53a9 (diff)
Fix for crash when assigning NULL pointer to node group node_tree property. This is generally allowed (though operators usually would prevent it).
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r--source/blender/nodes/intern/node_common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 94c91831169..36b27094cc4 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -105,6 +105,12 @@ int nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree)
bNode *node;
int valid = 1;
+ /* unspecified node group, generally allowed
+ * (if anything, should be avoided on operator level)
+ */
+ if (grouptree == NULL)
+ return 1;
+
if (nodetree == grouptree)
return 0;