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/blenloader/intern/versioning_userdef.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/blenloader/intern/versioning_userdef.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 691258a5a8c..0265bd85f14 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -303,10 +303,10 @@ static bool keymap_item_has_invalid_wm_context_data_path(wmKeyMapItem *kmi, } /* patching UserDef struct and Themes */ -void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) +void BLO_version_defaults_userpref_blend(UserDef *userdef) { - -#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(bmain, ver, subver) + /* #UserDef & #Main happen to have the same struct member. */ +#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver) /* the UserDef struct is not corrected with do_versions() .... ugh! */ if (userdef->wheellinescroll == 0) { |