[Bf-blender-cvs] [387ba87ad3] master: Cleanup: ignore open-blend as startup/prefs basis
Campbell Barton
noreply at git.blender.org
Wed Mar 22 19:26:28 CET 2017
Commit: 387ba87ad3b9eba8e0d117474b133a5a58ea44c6
Author: Campbell Barton
Date: Thu Mar 23 05:20:52 2017 +1100
Branches: master
https://developer.blender.org/rB387ba87ad3b9eba8e0d117474b133a5a58ea44c6
Cleanup: ignore open-blend as startup/prefs basis
No reason startup/prefs would ever be blend-file relative.
===================================================================
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 60a361122c..39c47599e3 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -675,15 +675,15 @@ int wm_homefile_read(
BLI_strncpy(filepath_startup, filepath_startup_override, FILE_MAX);
if (cfgdir) {
- BLI_make_file_string(G.main->name, filepath_userdef, cfgdir, BLENDER_USERPREF_FILE);
+ BLI_make_file_string("/", filepath_userdef, cfgdir, BLENDER_USERPREF_FILE);
}
else {
filepath_userdef[0] = '\0';
}
}
else if (cfgdir) {
- BLI_make_file_string(G.main->name, filepath_startup, cfgdir, BLENDER_STARTUP_FILE);
- BLI_make_file_string(G.main->name, filepath_userdef, cfgdir, BLENDER_USERPREF_FILE);
+ BLI_make_file_string("/", filepath_startup, cfgdir, BLENDER_STARTUP_FILE);
+ BLI_make_file_string("/", filepath_userdef, cfgdir, BLENDER_USERPREF_FILE);
}
else {
filepath_startup[0] = '\0';
More information about the Bf-blender-cvs
mailing list