blender
/
blender
130
398
Fork 575
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix crash loading without UI, after recent changes.

This commit is contained in:
Brecht Van Lommel 2018-05-23 18:04:43 +02:00
parent 3fb38d664b
commit e2a827c848
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenloader/intern/readfile.c
View File

@ -2877,19 +2877,29 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
IDP_LibLinkProperty(id->properties, fd);
id_us_ensure_real(id);
for (WorkSpaceDataRelation *relation = workspace->scene_viewlayer_relations.first;
for (WorkSpaceDataRelation *relation = workspace->scene_viewlayer_relations.first,
*relation_next = NULL;
relation != NULL;
relation = relation->next)
relation = relation_next)
{
relation_next = relation->next;
relation->parent = newlibadr(fd, id->lib, relation->parent);
/* relation->value is set in direct_link_workspace_link_scene_data,
* except when loading linked data. */
Scene *scene = relation->parent;
if (scene->id.lib != NULL) {
relation->value = BLI_findstring(&scene->view_layers, relation->value_name, offsetof(ViewLayer, name));
if (scene) {
if (scene->id.lib != NULL) {
relation->value = BLI_findstring(&scene->view_layers, relation->value_name, offsetof(ViewLayer, name));
}
if (relation->value == NULL) {
relation->value = scene->view_layers.first;
}
}
if (relation->value == NULL) {
relation->value = scene->view_layers.first;
else {
/* Remove empty relation if scene got lost. */
BLI_freelinkN(&workspace->scene_viewlayer_relations, relation);
}
}