4 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 3d8eee958a3..bd279e9b49e 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -2981,7 +2981,7 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
 
 	/* Cache files level animations (frame duration and such). */
 	if (!(ads->filterflag2 & ADS_FILTER_NOCACHEFILES) && !(ads->filterflag & ADS_FILTER_ONLYSEL)) {
-		CacheFile *cache_file = ac->bmain->cachefiles.first;
+		CacheFile *cache_file = ac->bmain->cachefile.first;
 		for (; cache_file; cache_file = cache_file->id.next) {
 			items += animdata_filter_ds_cachefile(ac, anim_data, ads, cache_file, filter_mode);
 		}
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 2f8f7d2d35b..8bf1ca1a6c8 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -470,7 +470,7 @@ void ED_screens_initialize(Main *bmain, wmWindowManager *wm)
 
 	for (win = wm->windows.first; win; win = win->next) {
 		if (BKE_workspace_active_get(win->workspace_hook) == NULL) {
-			BKE_workspace_active_set(win->workspace_hook, bmain->workspaces.first);
+			BKE_workspace_active_set(win->workspace_hook, bmain->workspace.first);
 		}
 
 		ED_screen_refresh(wm, win);
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 372bbd5f79b..83004da0ce9 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4913,7 +4913,7 @@ static int space_workspace_cycle_invoke(bContext *C, wmOperator *op, const wmEve
 	WorkSpace *workspace_dst = NULL;
 
 	ListBase ordered;
-	BKE_id_ordered_list(&ordered, &bmain->workspaces);
+	BKE_id_ordered_list(&ordered, &bmain->workspace);
 
 	for (LinkData *link = ordered.first; link; link = link->next) {
 		if (link->data == workspace_src) {
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index b442f718aa1..9f63bdff7c1 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -223,7 +223,7 @@ bool ED_workspace_delete(
 {
 	ID *workspace_id = (ID *)workspace;
 
-	if (BLI_listbase_is_single(&bmain->workspaces)) {
+	if (BLI_listbase_is_single(&bmain->workspace)) {
 		return false;
 	}
 
@@ -355,11 +355,11 @@ static int workspace_append_activate_exec(bContext *C, wmOperator *op)
 	RNA_string_get(op->ptr, "filepath", filepath);
 
 	if (workspace_append(C, filepath, idname) != OPERATOR_CANCELLED) {
-		WorkSpace *appended_workspace = BLI_findstring(&bmain->workspaces, idname, offsetof(ID, name) + 2);
+		WorkSpace *appended_workspace = BLI_findstring(&bmain->workspace, idname, offsetof(ID, name) + 2);
 		BLI_assert(appended_workspace != NULL);
 
 		/* Reorder to last position. */
-		BKE_id_reorder(&bmain->workspaces, &appended_workspace->id, NULL, true);
+		BKE_id_reorder(&bmain->workspace, &appended_workspace->id, NULL, true);
 
 		/* Changing workspace changes context. Do delayed! */
 		WM_event_add_notifier(C, NC_SCREEN | ND_WORKSPACE_SET, appended_workspace);
@@ -454,7 +454,7 @@ static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
 	if (startup_config) {
 		for (WorkSpace *workspace = startup_config->workspaces.first; workspace; workspace = workspace->id.next) {
 			uiLayout *row = uiLayoutRow(layout, false);
-			if (BLI_findstring(&bmain->workspaces, workspace->id.name, offsetof(ID, name))) {
+			if (BLI_findstring(&bmain->workspace, workspace->id.name, offsetof(ID, name))) {
 				uiLayoutSetActive(row, false);
 			}
 
@@ -479,7 +479,7 @@ static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
 			}
 
 			uiLayout *row = uiLayoutRow(layout, false);
-			if (BLI_findstring(&bmain->workspaces, workspace->id.name, offsetof(ID, name))) {
+			if (BLI_findstring(&bmain->workspace, workspace->id.name, offsetof(ID, name))) {
 				uiLayoutSetActive(row, false);
 			}
 
@@ -542,7 +542,7 @@ static int workspace_reorder_to_back_exec(bContext *C, wmOperator *UNUSED(op))
 	Main *bmain = CTX_data_main(C);
 	WorkSpace *workspace = workspace_context_get(C);
 
-	BKE_id_reorder(&bmain->workspaces, &workspace->id, NULL, true);
+	BKE_id_reorder(&bmain->workspace, &workspace->id, NULL, true);
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
 	return OPERATOR_INTERFACE;
@@ -565,7 +565,7 @@ static int workspace_reorder_to_front_exec(bContext *C, wmOperator *UNUSED(op))
 	Main *bmain = CTX_data_main(C);
 	WorkSpace *workspace = workspace_context_get(C);
 
-	BKE_id_reorder(&bmain->workspaces, &workspace->id, NULL, false);
+	BKE_id_reorder(&bmain->workspace, &workspace->id, NULL, false);
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
 
 	return OPERATOR_INTERFACE;