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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-05-03 16:55:18 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-05-03 16:55:18 +0400
commitd10da0fbd2a3edc4a35bd6695d1caa234f4e78f0 (patch)
tree3c01f5c76f2b906c139fa6648f986ed9d4d8c826 /source/blender/nodes
parenteec8de9469a7da0d86832358678029c11e7452be (diff)
Fix #31272: Blender Crashes when press render
Issue was caused by missed libraries. Seems compositor nodes already does check in such cases, added the same check to texture and shader nodes.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_common.c3
-rw-r--r--source/blender/nodes/texture/nodes/node_texture_common.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c
index f75cecfe83b..bd31f20b18c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_common.c
+++ b/source/blender/nodes/shader/nodes/node_shader_common.c
@@ -73,6 +73,9 @@ static void *group_initexec(bNode *node)
bNodeTree *ngroup= (bNodeTree*)node->id;
bNodeTreeExec *exec;
+ if (!ngroup)
+ return NULL;
+
/* initialize the internal node tree execution */
exec = ntreeShaderBeginExecTree(ngroup, 0);
diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c
index 9a66ecb5ffb..2a9107f9498 100644
--- a/source/blender/nodes/texture/nodes/node_texture_common.c
+++ b/source/blender/nodes/texture/nodes/node_texture_common.c
@@ -58,6 +58,9 @@ static void *group_initexec(bNode *node)
bNodeTree *ngroup= (bNodeTree*)node->id;
void *exec;
+ if (!ngroup)
+ return NULL;
+
/* initialize the internal node tree execution */
exec = ntreeTexBeginExecTree(ngroup, 0);