From d1f6c2e7bb59e12f381bffdbaf8274936f404b7e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 2 Oct 2020 20:11:51 +1000 Subject: 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. --- source/blender/blenloader/BLO_readfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenloader/BLO_readfile.h') diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 4571e50dd36..88d89d9d6da 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -228,7 +228,7 @@ void BLO_update_defaults_startup_blend(struct Main *bmain, const char *app_templ void BLO_update_defaults_workspace(struct WorkSpace *workspace, const char *app_template); /* Version patch user preferences. */ -void BLO_version_defaults_userpref_blend(struct Main *bmain, struct UserDef *userdef); +void BLO_version_defaults_userpref_blend(struct UserDef *userdef); /* Disable unwanted experimental feature settings on startup. */ void BLO_sanitize_experimental_features_userpref_blend(struct UserDef *userdef); -- cgit v1.2.3