diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ccbe3b9beaa..c4f56b345a1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2374,7 +2374,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; @@ -2387,7 +2387,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; @@ -6553,7 +6553,7 @@ static void lib_link_group(FileData *fd, Main *main) } } if (add_us) group->id.us++; - rem_from_group(group, NULL, NULL, NULL); /* removes NULL entries */ + BKE_group_object_unlink(group, NULL, NULL, NULL); /* removes NULL entries */ } } } @@ -6606,8 +6606,6 @@ static void direct_link_movieclip(FileData *fd, MovieClip *clip) clip->tracking.dopesheet.channels.first = clip->tracking.dopesheet.channels.last = NULL; clip->tracking.dopesheet.coverage_segments.first = clip->tracking.dopesheet.coverage_segments.last = NULL; - clip->prefetch_ok = FALSE; - link_list(fd, &tracking->objects); for (object = tracking->objects.first; object; object = object->next) { |