blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix error setting the user preferences 

User preferences from the startup.blend was still being used,
fixing this exposed missing theme initialization, now fixed.
This commit is contained in:
Campbell Barton 2019-08-01 17:23:41 +10:00
parent 036312ecff
commit d1848b80f1
Notes: blender-bot 2023-02-14 01:26:52 +01:00 
Referenced by issue #68017, Mouse Wars episode VI The Return of Right Click Select (2.81 initial splash defaults to Right now)
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/blendfile.c
View File

@ -560,8 +560,7 @@ UserDef *BKE_blendfile_userdef_read_from_memory(const void *filebuf,
UserDef *BKE_blendfile_userdef_from_defaults(void)
{
UserDef *userdef = MEM_mallocN(sizeof(*userdef), __func__);
memcpy(userdef, &U_default, sizeof(UserDef));
memcpy(userdef, &U_default, sizeof(*userdef));
/* Add-ons. */
{
@ -583,6 +582,14 @@ UserDef *BKE_blendfile_userdef_from_defaults(void)
}
}
/* Theme. */
{
bTheme *btheme = MEM_mallocN(sizeof(*btheme), __func__);
memcpy(btheme, &U_theme_default, sizeof(*btheme));
BLI_addtail(&userdef->themes, btheme);
}
#ifdef WITH_PYTHON_SECURITY
/* use alternative setting for security nuts
* otherwise we'd need to patch the binary blob - startup.blend.c */

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

@ -951,8 +951,8 @@ void wm_homefile_read(bContext *C,
if (use_userdef) {
if ((skip_flags & BLO_READ_SKIP_USERDEF) == 0) {
UserDef *userdef_default = BKE_blendfile_userdef_from_defaults();
BKE_blender_userdef_app_template_data_set_and_free(userdef_default);
skip_flags &= ~BLO_READ_SKIP_USERDEF;
BKE_blender_userdef_data_set_and_free(userdef_default);
skip_flags |= BLO_READ_SKIP_USERDEF;
}
}