diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 10 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 7 | ||||
| -rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 5 | ||||
| -rw-r--r-- | source/blender/blenloader/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 42 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
6 files changed, 59 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 6507999e9db..519d0c7fd6b 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -69,8 +69,10 @@ int BKE_read_file(struct bContext *C, const char *filepath, struct ReportList *r #define BKE_READ_FILE_OK 1 /* OK */ #define BKE_READ_FILE_OK_USERPREFS 2 /* OK, and with new user settings */ -int BKE_read_file_from_memory(struct bContext *C, const void *filebuf, int filelength, struct ReportList *reports); -int BKE_read_file_from_memfile(struct bContext *C, struct MemFile *memfile, struct ReportList *reports); +int BKE_read_file_from_memory(struct bContext *C, const void *filebuf, + int filelength, struct ReportList *reports, int update_defaults); +int BKE_read_file_from_memfile(struct bContext *C, struct MemFile *memfile, + struct ReportList *reports); int BKE_read_file_userdef(const char *filepath, struct ReportList *reports); int BKE_write_file_userdef(const char *filepath, struct ReportList *reports); @@ -100,11 +102,11 @@ extern const char *BKE_undo_get_name(int nr, int *active); extern int BKE_undo_save_file(const char *filename); extern struct Main *BKE_undo_get_main(struct Scene **scene); - /* copybuffer */ +/* copybuffer */ void BKE_copybuffer_begin(void); void BKE_copybuffer_tag_ID(struct ID *id); int BKE_copybuffer_save(const char *filename, struct ReportList *reports); - int BKE_copybuffer_paste(struct bContext *C, const char *libname, struct ReportList *reports); +int BKE_copybuffer_paste(struct bContext *C, const char *libname, struct ReportList *reports); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 3fbdba351b0..5ef39e8d48e 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -462,13 +462,16 @@ int BKE_read_file(bContext *C, const char *filepath, ReportList *reports) return (bfd ? retval : BKE_READ_FILE_FAIL); } -int BKE_read_file_from_memory(bContext *C, const void *filebuf, int filelength, ReportList *reports) +int BKE_read_file_from_memory(bContext *C, const void *filebuf, int filelength, ReportList *reports, int update_defaults) { BlendFileData *bfd; bfd = BLO_read_from_memory(filebuf, filelength, reports); - if (bfd) + if (bfd) { + if (update_defaults) + BLO_update_defaults_startup_blend(bfd->main); setup_app_data(C, bfd, "<memory2>"); + } else BKE_reports_prepend(reports, "Loading failed: "); diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 00ff5863e59..58d0cf6d264 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -265,7 +265,10 @@ void BLO_main_expander(void (*expand_doit_func)(void *, struct Main *, void *)); * \param mainvar the Main database to expand */ void BLO_expand_main(void *fdhandle, struct Main *mainvar); - + +/* Update defaults in startup.blend, without having to save and embed it */ +void BLO_update_defaults_startup_blend(struct Main *mainvar); + #ifdef __cplusplus } #endif diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 104c58b1c9e..f865962bac9 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -46,6 +46,7 @@ set(SRC intern/runtime.c intern/undofile.c intern/versioning_250.c + intern/versioning_defaults.c intern/versioning_legacy.c intern/writefile.c diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c new file mode 100644 index 00000000000..beb8d901ab1 --- /dev/null +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -0,0 +1,42 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + * + */ + +/** \file blender/blenloader/intern/versioning_defaults.c + * \ingroup blenloader + */ + +#include "BLI_utildefines.h" + +#include "DNA_scene_types.h" +#include "DNA_userdef_types.h" + +#include "BKE_main.h" + +#include "BLO_readfile.h" + +/* Update defaults in startup.blend, without having to save and embed the file. + * This function can be emptied each time the startup.blend is updated. */ +void BLO_update_defaults_startup_blend(Main *main) +{ +} + diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index abda68d8b24..cc4d422331d 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -554,7 +554,7 @@ int wm_homefile_read(bContext *C, ReportList *UNUSED(reports), short from_memory } if (success == 0) { - success = BKE_read_file_from_memory(C, datatoc_startup_blend, datatoc_startup_blend_size, NULL); + success = BKE_read_file_from_memory(C, datatoc_startup_blend, datatoc_startup_blend_size, NULL, true); if (wmbase.first == NULL) wm_clear_default_size(C); BLI_init_temporary_dir(U.tempdir); |