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>2018-09-12 12:58:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-12 12:59:28 +0300
commit52baf87f1f12fcaa206bbef514d66c32fadbd9e2 (patch)
tree3cdb874a356860526733f0cbabeda85c14e4f25e /source/blender/blenloader
parent915c1f3a38193d90dcdba2cf0a5b0e64434fb574 (diff)
Cleanup: move theme versioning into own function
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 6ca7bba1ed2..a55568129c5 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -39,8 +39,21 @@
#include "BLO_readfile.h" /* Own include. */
+/* Disallow access to global userdef. */
#define U (_error_)
+#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver)
+
+static void do_versions_theme(UserDef *userdef, bTheme *btheme)
+{
+ if (!USER_VERSION_ATLEAST(280, 20)) {
+ memcpy(btheme, &U_theme_default, sizeof(*btheme));
+ }
+}
+
+#undef USER_VERSION_ATLEAST
+
+
/* patching UserDef struct and Themes */
void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
{
@@ -323,4 +336,8 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
#endif
/* this timer uses U */
// XXX reset_autosave();
+
+ for (bTheme *btheme = userdef->themes.first; btheme; btheme = btheme->next) {
+ do_versions_theme(userdef, btheme);
+ }
}