diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-03-06 15:34:57 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-03-06 15:34:57 +0400 |
| commit | 92322b57d4652275e328b8ee94d631e72a82ed0e (patch) | |
| tree | fe6b4018bbf339855187175c5f3d7cf5049a5a8d /source/blender/editors | |
| parent | 2b9551a4e4306b7ec1501da2510a8a35895eb8af (diff) | |
Fix for 30439, Cycles node group conversion wasn't checking node->id pointer (group node without internal node tree). This is a somewhat unusual case (UI buttons don't allow unlinking group tree), but not entirely forbidden.
Also fixed similar issue in node_templates.c where the group tree is used to generate a button name.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_node/node_templates.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index 24fb55be38e..781f37918fd 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -277,8 +277,12 @@ static void ui_node_sock_name(bNodeSocket *sock, char name[UI_MAX_NAME_STR]) bNode *node = sock->link->fromnode; char node_name[UI_MAX_NAME_STR]; - if(node->type == NODE_GROUP) - BLI_strncpy(node_name, node->id->name+2, UI_MAX_NAME_STR); + if(node->type == NODE_GROUP) { + if (node->id) + BLI_strncpy(node_name, node->id->name+2, UI_MAX_NAME_STR); + else + BLI_strncpy(node_name, "Group", UI_MAX_NAME_STR); + } else BLI_strncpy(node_name, node->typeinfo->name, UI_MAX_NAME_STR); |