diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-31 14:06:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-31 14:06:36 +0300 |
| commit | 7f7c807a92e35a1c34ced6749f88e62c2590ee89 (patch) | |
| tree | 92021e2f97196557d9e0653576d1452f22f1e145 /source/blender/windowmanager/intern/wm_files.c | |
| parent | e5fa738ce972460e0c1053400c00af226086b1ee (diff) | |
Keep current app-template when selecting 'New File'
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 2e799307cc0..b7703422aea 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -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); |