archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Keep current app-template when selecting 'New File'

Browse Source
This commit is contained in:
Campbell Barton
2017-03-31 22:06:36 +11:00
parent e5fa738ce9
commit 7f7c807a92
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/windowmanager/intern/wm_files.c
View File

@@ -708,11 +708,18 @@ int wm_homefile_read(
/* load preferences before startup.blend */
if (!use_factory_settings && BLI_exists(filepath_userdef)) {
/* keep existing app-template for regular file-new */
char app_template_buf[sizeof(U.app_template)] = "";
BLI_strncpy(app_template_buf, U.app_template, sizeof(app_template_buf));
UserDef *userdef = BKE_blendfile_userdef_read(filepath_userdef, NULL);
if (userdef != NULL) {
BKE_blender_userdef_set_data(userdef);
MEM_freeN(userdef);
BLI_strncpy(U.app_template, app_template_buf, sizeof(app_template_buf));
read_userdef_from_memory = false;
skip_flags |= BLO_READ_SKIP_USERDEF;
printf("Read prefs: %s\n", filepath_userdef);