archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T53481: Linked scene crashes on load

Browse Source
This commit is contained in:
Campbell Barton
2018-05-23 12:19:56 +02:00
parent 858e8f453d
commit d59b74adb3
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2882,7 +2882,15 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
relation = relation->next) relation = relation->next)
{ {
relation->parent = newlibadr(fd, id->lib, relation->parent); relation->parent = newlibadr(fd, id->lib, relation->parent);
/* relation->value is set in direct_link_workspace_link_scene_data */ /* 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_idname, offsetof(ViewLayer, name));
}
if (relation->value == NULL) {
relation->value = scene->view_layers.first;
}
} }
for (WorkSpaceLayout *layout = layouts->first, *layout_next; layout; layout = layout_next) { for (WorkSpaceLayout *layout = layouts->first, *layout_next; layout; layout = layout_next) {
@@ -6066,12 +6074,15 @@ static void direct_link_workspace_link_scene_data(
relation != NULL; relation != NULL;
relation = relation->next) relation = relation->next)
{ {
ViewLayer *layer = newdataadr(fd, relation->value); ViewLayer *view_layer = newdataadr(fd, relation->value);
if (layer) { if (view_layer != NULL) {
BLI_assert(BLI_findindex(&scene->view_layers, layer) != -1); BLI_assert(BLI_findindex(&scene->view_layers, view_layer) != -1);
/* relation->parent is set in lib_link_workspaces */ /* relation->parent is set in lib_link_workspaces */
relation->value = layer;
} }
if (UNLIKELY(view_layer == NULL)) {
view_layer = scene->view_layers.first;
}
relation->value = view_layer;
} }
} }
} }

8
source/blender/blenloader/intern/writefile.c
View File

@@ -3596,6 +3596,14 @@ static void write_workspace(WriteData *wd, WorkSpace *workspace)
{ {
ListBase *layouts = BKE_workspace_layouts_get(workspace); ListBase *layouts = BKE_workspace_layouts_get(workspace);
/* Update the names for file (only need to set on write). */
for (WorkSpaceDataRelation *relation = workspace->scene_viewlayer_relations.first;
relation;
relation = relation->next)
{
STRNCPY(relation->value_idname, ((ViewLayer *)relation->value)->name);
}
writestruct(wd, ID_WS, WorkSpace, 1, workspace); writestruct(wd, ID_WS, WorkSpace, 1, workspace);
writelist(wd, DATA, WorkSpaceLayout, layouts); writelist(wd, DATA, WorkSpaceLayout, layouts);
writelist(wd, DATA, WorkSpaceDataRelation, &workspace->hook_layout_relations); writelist(wd, DATA, WorkSpaceDataRelation, &workspace->hook_layout_relations);

3
source/blender/makesdna/DNA_workspace_types.h
View File

@@ -180,6 +180,9 @@ typedef struct WorkSpaceDataRelation {
void *parent; void *parent;
/* The value for this parent-data/workspace relation */ /* The value for this parent-data/workspace relation */
void *value; void *value;
/** Use when we reference non-ID data, this allows use to look it up when linking in a workspace. */
char value_idname[64]; /* MAX_NAME. */
} WorkSpaceDataRelation; } WorkSpaceDataRelation;
#endif /* DNA_PRIVATE_WORKSPACE_READ_WRITE */ #endif /* DNA_PRIVATE_WORKSPACE_READ_WRITE */