blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Workspace: remove deprecated view layer 

Was removed in 2.80.4, this was not default and unsupported for linking.
This commit is contained in:
Campbell Barton 2018-05-23 08:58:47 +02:00
parent 8ac8ef8ec7
commit 37b5c52f11
Notes: blender-bot 2023-02-14 11:01:33 +01:00 
Referenced by issue #55166, Join 2 windows crash
Referenced by issue #55160, Renaming view layer crash
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}
}
}
}

18
source/blender/blenloader/intern/versioning_280.c
View File

@ -773,24 +773,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

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

@ -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 */