diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-23 09:58:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-23 10:37:33 +0300 |
| commit | 37b5c52f111d4fe6e024c1cd66ba965b3b6bd83d (patch) | |
| tree | 9e4e1ccc47f22325b535c1b887a642d6619be9a8 /source | |
| parent | 8ac8ef8ec7c801d0f3ecf8d2b9dd62c0deafe2ce (diff) | |
Workspace: remove deprecated view layer
Was removed in 2.80.4, this was not default and unsupported for linking.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 18 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_workspace_types.h | 2 |
3 files changed, 0 insertions, 28 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c92b27bdb1c..867eb1d749a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6073,14 +6073,6 @@ static void direct_link_workspace_link_scene_data( relation->value = layer; } } - - if (workspace->view_layer) { /* this was temporariliy used during 2.8 project. Keep files compatible */ - ViewLayer *layer = newdataadr(fd, workspace->view_layer); - /* only set when layer is from the scene we read */ - if (layer && (BLI_findindex(&scene->view_layers, layer) != -1)) { - workspace->view_layer = layer; - } - } } } diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index be0ae64faa4..ff3109f13e8 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -774,24 +774,6 @@ void do_versions_after_linking_280(Main *main) } if (!MAIN_VERSION_ATLEAST(main, 280, 4)) { - for (WorkSpace *workspace = main->workspaces.first; workspace; workspace = workspace->id.next) { - if (workspace->view_layer) { - /* During 2.8 work we temporarly stored view-layer in the - * workspace directly, but should be stored there per-scene. */ - for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { - if (BLI_findindex(&scene->view_layers, workspace->view_layer) != -1) { - BKE_workspace_view_layer_set(workspace, workspace->view_layer, scene); - workspace->view_layer = NULL; - } - } - } - /* While this should apply to most cases, it fails when reading workspaces.blend - * to get its list of workspaces without actually appending any of them. */ -// BLI_assert(workspace->view_layer == NULL); - } - } - - if (!MAIN_VERSION_ATLEAST(main, 280, 4)) { for (Object *object = main->object.first; object; object = object->id.next) { #ifndef VERSION_280_SUBVERSION_4 /* If any object already has an initialized value for diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index ca9186e16bf..9da42d71d0f 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -131,8 +131,6 @@ typedef struct WorkSpace { /* Feature tagging (use for addons) */ ListBase owner_ids DNA_PRIVATE_WORKSPACE_READ_WRITE; /* wmOwnerID */ - struct ViewLayer *view_layer DNA_DEPRECATED; - /* should be: '#ifdef USE_WORKSPACE_TOOL'. */ /** List of #bToolRef */ |