[Bf-blender-cvs] [49a7031caae] master: Fix T64588: some new theme preferences not saving

Brecht Van Lommel noreply at git.blender.org
Tue May 14 10:46:07 CEST 2019


Commit: 49a7031caae8be7fa556b60b67b3fc978d0d947e
Author: Brecht Van Lommel
Date:   Tue May 14 10:42:53 2019 +0200
Branches: master
https://developer.blender.org/rB49a7031caae8be7fa556b60b67b3fc978d0d947e

Fix T64588: some new theme preferences not saving

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

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 24eac507945..30374e6c63d 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -114,10 +114,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
     FROM_DEFAULT_V4_UCHAR(space_info.info_info);
   }
 
-  /**
-   * Include next version bump.
-   */
-  {
+  if (!USER_VERSION_ATLEAST(280, 64)) {
     FROM_DEFAULT_V4_UCHAR(tui.icon_scene);
 
     if (btheme->space_view3d.obcenter_dia == 0) {
@@ -137,6 +134,12 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
     FROM_DEFAULT_V4_UCHAR(space_clip.scrubbing_background);
   }
 
+  /**
+   * Include next version bump.
+   */
+  {
+  }
+
 #undef FROM_DEFAULT_V4_UCHAR
 
 #undef USER_VERSION_ATLEAST



More information about the Bf-blender-cvs mailing list