1 files changed, 21 insertions, 4 deletions

diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 11f34732cfc..1251424719a 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -39,15 +39,18 @@ extern "C" {
 struct BlendThumbnail;
 struct bScreen;
 struct LinkNode;
+struct ListBase;
 struct Main;
 struct MemFile;
 struct ReportList;
 struct Scene;
+struct ViewLayer;
 struct UserDef;
 struct View3D;
 struct bContext;
 struct BHead;
 struct FileData;
+struct wmWindowManager;
 
 typedef struct BlendHandle BlendHandle;
 
@@ -65,12 +68,19 @@ typedef struct BlendFileData {
 	int globalf;
 	char filename[1024];    /* 1024 = FILE_MAX */
 
-	struct bScreen *curscreen;
+	struct bScreen *curscreen; /* TODO think this isn't needed anymore? */
 	struct Scene *curscene;
+	struct ViewLayer *cur_view_layer; /* layer to activate in workspaces when reading without UI */
 
 	eBlenFileType type;
 } BlendFileData;
 
+typedef struct WorkspaceConfigFileData {
+	struct Main *main; /* has to be freed when done reading file data */
+
+	struct ListBase workspaces;
+} WorkspaceConfigFileData;
+
 
 /* skip reading some data-block types (may want to skip screen data too). */
 typedef enum eBLOReadSkip {
@@ -124,8 +134,10 @@ struct ID *BLO_library_link_named_part(struct Main *mainl, BlendHandle **bh, con
 struct ID *BLO_library_link_named_part_ex(
         struct Main *mainl, BlendHandle **bh,
         const short idcode, const char *name, const int flag,
-        struct Scene *scene, struct View3D *v3d);
-void BLO_library_link_end(struct Main *mainl, BlendHandle **bh, short flag, struct Scene *scene, struct View3D *v3d);
+        struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer);
+void BLO_library_link_end(
+        struct Main *mainl, BlendHandle **bh, int flag,
+        struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer);
 
 void BLO_library_link_copypaste(struct Main *mainl, BlendHandle *bh);
 
@@ -134,7 +146,9 @@ void *BLO_library_read_struct(struct FileData *fd, struct BHead *bh, const char
 BlendFileData *blo_read_blendafterruntime(int file, const char *name, int actualsize, struct ReportList *reports);
 
 /* internal function but we need to expose it */
-void blo_lib_link_screen_restore(struct Main *newmain, struct bScreen *curscreen, struct Scene *curscene);
+void blo_lib_link_restore(
+        struct Main *newmain, struct wmWindowManager *curwm,
+        struct Scene *curscene, struct ViewLayer *cur_render_layer);
 
 typedef void (*BLOExpandDoitCallback) (void *fdhandle, struct Main *mainvar, void *idv);
 
@@ -149,6 +163,9 @@ struct BlendThumbnail *BLO_thumbnail_from_file(const char *filepath);
 
 struct Main *BLO_main_from_memfile(struct MemFile *memfile, struct Main *bmain, struct Scene **r_scene);
 
+/* datafiles (generated theme) */
+extern const struct bTheme U_theme_default;
+
 #ifdef __cplusplus
 }
 #endif