Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T52278: 'Default' application template fails

Browse Source 
Own error in 7398b3b7
This commit is contained in:
Campbell Barton
2017-08-07 21:17:14 +10:00
parent 2a74f36dac
commit d1752167a9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -721,20 +721,20 @@ int wm_homefile_read(
if (filepath_startup_override != NULL) { if (filepath_startup_override != NULL) {
/* pass */ /* pass */
} }
else if (app_template_override && app_template_override[0]) { else if (app_template_override) {
/* This may be clearing the current template by setting to an empty string. */
app_template = app_template_override; app_template = app_template_override;
} }
else if (!use_factory_settings && U.app_template[0]) { else if (!use_factory_settings && U.app_template[0]) {
app_template = U.app_template; app_template = U.app_template;
} }
if (app_template != NULL) { if ((app_template != NULL) && (app_template[0] != '\0')) {
BKE_appdir_app_template_id_search(app_template, app_template_system, sizeof(app_template_system)); BKE_appdir_app_template_id_search(app_template, app_template_system, sizeof(app_template_system));
BLI_path_join(app_template_config, sizeof(app_template_config), cfgdir, app_template, NULL); BLI_path_join(app_template_config, sizeof(app_template_config), cfgdir, app_template, NULL);
}
/* insert template name into startup file */ /* Insert template name into startup file. */
if (app_template != NULL) {
/* note that the path is being set even when 'use_factory_settings == true' /* note that the path is being set even when 'use_factory_settings == true'
* this is done so we can load a templates factory-settings */ * this is done so we can load a templates factory-settings */
if (!use_factory_settings) { if (!use_factory_settings) {