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>2019-01-11 04:59:19 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-11 04:59:19 +0300
commit5c6d5cb8639aa71e2728258e9a4afe7c9d822bc7 (patch)
tree6633ee4150ef2246ffa8ced974f1b883d1d4bb44 /source/blender/blenloader
parentf98e4cbedbb73d22b649275208e0318838dea089 (diff)
Fix background color use in 3D view
TH_BACK was being used when drawing the 3D view even though there was no way to set the color in the preferences. The color was zero'd when moving to the new 2.8x theme. Having both gradient and background colors was confusing, especially having to use 'TH_HIGH_GRAD' for the 3D view, 'TH_BACK' for other views. Move the background color back to 'TH_BACK', 'TH_BACK_GRAD' is used when gradients are enabled. RNA is unchanged so presets don't need updating.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 4fed46170a9..3143c5069e6 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -108,6 +108,10 @@ static void do_versions_theme(UserDef *userdef, bTheme *btheme)
copy_v4_v4_char(btheme->tuserpref.execution_buts, btheme->tuserpref.navigation_bar);
}
+ if (!USER_VERSION_ATLEAST(280, 41)) {
+ copy_v4_v4_char(btheme->tv3d.back, U_theme_default.tv3d.back);
+ }
+
#undef USER_VERSION_ATLEAST
}
@@ -465,10 +469,7 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
USER_UIFLAG_DEPRECATED_22);
}
- /**
- * Include next version bump.
- */
- {
+ if (!USER_VERSION_ATLEAST(280, 41)) {
/* (keep this block even if it becomes empty). */
if (userdef->pie_tap_timeout == 0) {
@@ -476,6 +477,13 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
}
}
+ /**
+ * Include next version bump.
+ */
+ {
+ /* (keep this block even if it becomes empty). */
+ }
+
if (userdef->pixelsize == 0.0f)
userdef->pixelsize = 1.0f;