From c9abb0fe2699478d1027667e6f527c8d60df5786 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 20 Aug 2018 13:52:50 +0200 Subject: Workspaces: replace bundled workspace.blend with embedded startup.blend. We want these to have the same workspaces in both, so there is no reason to have two files that are identical. --- source/blender/windowmanager/intern/wm_files_link.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 903795d6943..fb17de26703 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -74,6 +74,7 @@ #include "IMB_colormanagement.h" +#include "ED_datafiles.h" #include "ED_screen.h" #include "RNA_access.h" @@ -228,7 +229,12 @@ static void wm_link_do( for (lib_idx = 0, liblink = lapp_data->libraries.list; liblink; lib_idx++, liblink = liblink->next) { char *libname = liblink->link; - bh = BLO_blendhandle_from_file(libname, reports); + if (STREQ(libname, BLO_EMBEDDED_STARTUP_BLEND)) { + bh = BLO_blendhandle_from_memory(datatoc_startup_blend, datatoc_startup_blend_size); + } + else { + bh = BLO_blendhandle_from_file(libname, reports); + } if (bh == NULL) { /* Unlikely since we just browsed it, but possible -- cgit v1.2.3