[Bf-blender-cvs] [e8d4304b554] master: Correct version patching of Preferences theme

[Julian Eisel]

Commit: e8d4304b5541d82b6ebc85f17d11da1f61a6e5d7
Author: Julian Eisel
Date:   Sat Jan 5 19:43:09 2019 +0100
Branches: master
https://developer.blender.org/rBe8d4304b5541d82b6ebc85f17d11da1f61a6e5d7

Correct version patching of Preferences theme

In a77b63c56943eb, the Preferences navigation region background was
made brighter. Recently stored userpref.blends (since b00963afc14978b,
so beta release included) would still use the slightly darker
background for the Preferences navigation region.
Now the version patch added for a77b63c56943eb also sets the new color
for those recent configs.

===================================================================

M	source/blender/blenloader/intern/versioning_userdef.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index de5a1c8a79e..59745f7bbf3 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -93,10 +93,6 @@ static void do_versions_theme(UserDef *userdef, bTheme *btheme)
 		copy_v4_v4_char(btheme->tclip.list_text, U_theme_default.tclip.list_text);
 	}
 
-	if (!USER_VERSION_ATLEAST(280, 33)) {
-		copy_v4_v4_char(btheme->tuserpref.navigation_bar, U_theme_default.tuserpref.navigation_bar);
-	}
-
 	if (!USER_VERSION_ATLEAST(280, 36)) {
 		copy_v4_v4_char(btheme->tui.wcol_state.inner_changed, U_theme_default.tui.wcol_state.inner_changed);
 		copy_v4_v4_char(btheme->tui.wcol_state.inner_changed_sel, U_theme_default.tui.wcol_state.inner_changed_sel);
@@ -108,6 +104,7 @@ static void do_versions_theme(UserDef *userdef, bTheme *btheme)
 	}
 
 	if (!USER_VERSION_ATLEAST(280, 40)) {
+		copy_v4_v4_char(btheme->tuserpref.navigation_bar, U_theme_default.tuserpref.navigation_bar);
 		copy_v4_v4_char(btheme->tuserpref.execution_buts, btheme->tuserpref.navigation_bar);
 	}