diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-25 15:54:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-25 16:06:40 +0300 |
| commit | 40638e197004bfe843fa90694bfb3282dd37bdd4 (patch) | |
| tree | 55533259a1cc469d1edaa98e6537a700b9c137dd /source/blender/blenloader | |
| parent | 657fedbbee661324285f24831fbb3a6d91e9a63e (diff) | |
Fix T55062: crash with workspace scene relations.
List of relations was saved with wrong struct type.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ce48d86469a..e74f82dfb6d 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2867,7 +2867,7 @@ static void direct_link_cachefile(FileData *fd, CacheFile *cache_file) static void lib_link_workspace_scene_data(FileData *fd, WorkSpace *workspace) { - for (WorkSpaceSceneRelation *relation = workspace->scene_relations.first; + for (WorkSpaceSceneRelation *relation = workspace->scene_layer_relations.first; relation != NULL; relation = relation->next) { @@ -2917,7 +2917,7 @@ static void direct_link_workspace(FileData *fd, WorkSpace *workspace, const Main { link_list(fd, BKE_workspace_layouts_get(workspace)); link_list(fd, &workspace->hook_layout_relations); - link_list(fd, &workspace->scene_relations); + link_list(fd, &workspace->scene_layer_relations); link_list(fd, &workspace->owner_ids); link_list(fd, &workspace->tools); @@ -7133,7 +7133,7 @@ static void lib_link_clipboard_restore(struct IDNameLib_Map *id_map) static void lib_link_workspace_scene_data_restore(struct IDNameLib_Map *id_map, WorkSpace *workspace) { - for (WorkSpaceSceneRelation *relation = workspace->scene_relations.first; + for (WorkSpaceSceneRelation *relation = workspace->scene_layer_relations.first; relation != NULL; relation = relation->next) { diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index a9c266c2bb2..de1699e24b7 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -3602,7 +3602,7 @@ static void write_workspace(WriteData *wd, WorkSpace *workspace) writestruct(wd, ID_WS, WorkSpace, 1, workspace); writelist(wd, DATA, WorkSpaceLayout, layouts); writelist(wd, DATA, WorkSpaceDataRelation, &workspace->hook_layout_relations); - writelist(wd, DATA, WorkSpaceDataRelation, &workspace->scene_relations); + writelist(wd, DATA, WorkSpaceSceneRelation, &workspace->scene_layer_relations); writelist(wd, DATA, wmOwnerID, &workspace->owner_ids); writelist(wd, DATA, bToolRef, &workspace->tools); for (bToolRef *tref = workspace->tools.first; tref; tref = tref->next) { |