diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-04-03 12:25:29 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-04-03 12:25:29 +0400 |
| commit | 9512ae1a4a7b6242f425c219b4dec572f6a88bb8 (patch) | |
| tree | 1f1f341b0b76f799ac5ee78e3a787c1516026103 /source/blender/blenloader | |
| parent | 3092b24ef2fb02e163dfcb80918ced4e375e7192 (diff) | |
Fix #34838, Can not append mesh from 2.5 (Crash in Nodes). The compatibility code for node group socket indices was assuming the new group node types even for 2.56.2 files, before these node groups had actually been converted ... Needs to use old way of identifying node group links (fromnode/tonode == NULL) instead of input/output node types.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 92d32919114..fd79f6c8512 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2373,7 +2373,7 @@ static void lib_node_do_versions_group_indices(bNode *gnode) int old_index = sock->to_index; for (link = ngroup->links.first; link; link = link->next) { - if (link->tonode->type == NODE_GROUP_OUTPUT && link->fromsock->own_index == old_index) { + if (link->tonode == NULL && link->fromsock->own_index == old_index) { strcpy(sock->identifier, link->fromsock->identifier); /* deprecated */ sock->own_index = link->fromsock->own_index; @@ -2386,7 +2386,7 @@ static void lib_node_do_versions_group_indices(bNode *gnode) int old_index = sock->to_index; for (link = ngroup->links.first; link; link = link->next) { - if (link->fromnode->type == NODE_GROUP_INPUT && link->tosock->own_index == old_index) { + if (link->fromnode == NULL && link->tosock->own_index == old_index) { strcpy(sock->identifier, link->tosock->identifier); /* deprecated */ sock->own_index = link->tosock->own_index; |