From 5c6d5cb8639aa71e2728258e9a4afe7c9d822bc7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 11 Jan 2019 12:59:19 +1100 Subject: 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. --- source/blender/makesdna/DNA_userdef_types.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 301dba3fac2..a749fba5026 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -164,13 +164,6 @@ typedef struct uiPanelColors { char pad2[4]; } uiPanelColors; -typedef struct uiGradientColors { - char gradient[4]; - char high_gradient[4]; - int show_grad; - int pad2; -} uiGradientColors; - typedef struct ThemeUI { /* Interface Elements (buttons, menus, icons) */ uiWidgetColors wcol_regular, wcol_tool, wcol_toolbar_item, wcol_text; @@ -227,6 +220,11 @@ typedef struct ThemeUI { typedef struct ThemeSpace { /* main window colors */ char back[4]; + char back_grad[4]; + + char show_back_grad; + char _pad0[3]; + /** Panel title. */ char title[4]; char text[4]; @@ -277,8 +275,6 @@ typedef struct ThemeSpace { /* note, cannot use name 'panel' because of DNA mapping old files */ uiPanelColors panelcolors; - uiGradientColors gradients; - char shade1[4]; char shade2[4]; -- cgit v1.2.3