diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-04 15:49:58 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-04 15:49:58 +0400 |
commit | df553582e96569e49a4d28c167c5dd334be5f216 (patch) | |
tree | ab1be5aecd7fd91ce59e8c5f820b0c408c28c78d /source/blender | |
parent | c01aa64247357570e4f469185240a416075bd971 (diff) |
Fix #31288: Blender crash when select a material
Quite the same issue as render crash on missed shader groups, needed a NULL-check
in node exec function as well.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_common.c | 3 | ||||
-rw-r--r-- | source/blender/nodes/texture/nodes/node_texture_common.c | 3 |
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 bd31f20b18c..df369482a2e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_common.c +++ b/source/blender/nodes/shader/nodes/node_shader_common.c @@ -124,6 +124,9 @@ static void group_execute(void *data, int thread, struct bNode *node, void *node bNodeTreeExec *exec= (bNodeTreeExec*)nodedata; bNodeThreadStack *nts; + if (!exec) + return; + /* XXX same behavior as trunk: all nodes inside group are executed. * it's stupid, but just makes it work. compo redesign will do this better. */ diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c index 2a9107f9498..1eaf9b2b0fe 100644 --- a/source/blender/nodes/texture/nodes/node_texture_common.c +++ b/source/blender/nodes/texture/nodes/node_texture_common.c @@ -110,6 +110,9 @@ static void group_execute(void *data, int thread, struct bNode *node, void *node bNodeTreeExec *exec= (bNodeTreeExec*)nodedata; bNodeThreadStack *nts; + if (!exec) + return; + /* XXX same behavior as trunk: all nodes inside group are executed. * it's stupid, but just makes it work. compo redesign will do this better. */ |