Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-08-01 10:23:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-01 10:23:41 +0300
commitd1848b80f1caaebf31d2f6e3207d6e6f00347362 (patch)
treec9130334645febe597d2896d9ddd59ed1e951baa /source/blender/windowmanager
parent036312ecff459f7600361d5aba9a0dba896849a1 (diff)
Fix error setting the user preferences
User preferences from the startup.blend was still being used, fixing this exposed missing theme initialization, now fixed.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_files.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index e55d78c7842..10773cf58e1 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -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;
}
}