diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 13:11:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 13:21:27 +0300 |
| commit | d1f6c2e7bb59e12f381bffdbaf8274936f404b7e (patch) | |
| tree | 797bf49c87aa1b336f7f9c8bf602465f89671c7a /source/blender/editors/interface/resources.c | |
| parent | 34228d138b79e9ad6cdbded4bc5df1eefb1aad1c (diff) | |
Fix userpref.blend using version from startup.blend
Version patching userpref.blend wasn't using the correct version,
causing settings not to be properly updated.
This seems the likely cause of T70196 and similar bugs.
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 76ad3981586..1601d9914a3 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1501,9 +1501,9 @@ void UI_make_axis_color(const uchar src_col[3], uchar dst_col[3], const char axi } /* patching UserDef struct and Themes */ -void init_userdef_do_versions(Main *bmain) +void init_userdef_do_versions(void) { - BLO_version_defaults_userpref_blend(bmain, &U); + BLO_version_defaults_userpref_blend(&U); if (STREQ(U.tempdir, "/")) { BKE_tempdir_system_init(U.tempdir); |