Commit: 9a11aeb300cef2eef5df3b606468a6bcdaca3550
Author: Campbell Barton
Date:   Mon Apr 16 17:23:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9a11aeb300cef2eef5df3b606468a6bcdaca3550

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/interface/resources.c
index 687b225b838,33d0b2ae608..de9469a48cb
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2931,37 -2773,13 +2931,39 @@@ void init_userdef_do_versions(void
                U.uiflag |= USER_LOCK_CURSOR_ADJUST;
        }
  
 +      if (!USER_VERSION_ATLEAST(280, 1)) {
 +              /* interface_widgets.c */
 +              struct uiWidgetColors wcol_tab = {
 +                      {255, 255, 255, 255},
 +                      {83, 83, 83, 255},
 +                      {114, 114, 114, 255},
 +                      {90, 90, 90, 255},
 +
 +                      {0, 0, 0, 255},
 +                      {0, 0, 0, 255},
 +
 +                      0,
 +                      0, 0
 +              };
 +
 +              for (bTheme *btheme = U.themes.first; btheme; btheme = 
btheme->next) {
 +                      btheme->tui.wcol_tab = wcol_tab;
 +              }
 +      }
 +
        /**
         * Include next version bump.
-        *
-        * (keep this block even if it becomes empty).
         */
+       {
+               /* (keep this block even if it becomes empty). */
+       }
+ 
 +      if (((bTheme *)U.themes.first)->tui.manipulator_hi[3] == 0) {
 +              for (bTheme *btheme = U.themes.first; btheme; btheme = 
btheme->next) {
 +                      ui_theme_space_init_manipulator_colors(btheme);
 +              }
 +      }
 +
        if (U.pixelsize == 0.0f)
                U.pixelsize = 1.0f;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to