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>2020-10-02 16:23:57 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-10-03 00:25:36 +0300
commite255040c7797a282cb0ea614e3f95c6a59cd0298 (patch)
tree74288668c0795403f7a44ff6e53588ef7568d611 /source/blender/blenloader/intern/readfile.c
parent15a9579a03f1ca65df477a1a39dbaef572ff3e9f (diff)
Cleanup: run UserDef versioning from readfile.c
Now versioning UserDef is run in readfile.c, as is done for other Blender data. Previously versioning was mixed with other run-time initialization, so it needed to be called later by the window manager.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index c9e279f7588..2ea4206bab3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6883,15 +6883,15 @@ static void link_global(FileData *fd, BlendFileData *bfd)
/** \name Versioning
* \{ */
-/* initialize userdef with non-UI dependency stuff */
-/* other initializers (such as theme color defaults) go to resources.c */
-static void do_versions_userdef(FileData *fd, BlendFileData *bfd)
+static void do_versions_userdef(FileData *UNUSED(fd), BlendFileData *bfd)
{
UserDef *user = bfd->user;
if (user == NULL) {
return;
}
+
+ BLO_version_defaults_userpref_blend(user);
}
static void do_versions(FileData *fd, Library *lib, Main *main)