diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 05:14:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 05:14:33 +0400 |
| commit | 3c8d86e117b54914524cbc49a8678ecaad8671cf (patch) | |
| tree | 8101c8b12f888ded58d7e489e7855e754f0cf065 /source/blender/makesdna | |
| parent | 331dd678c75ba1ef4e714c989c8f1bfae35508c2 (diff) | |
| parent | acf30220c9d63e0f060ee69115fe82016de025d4 (diff) | |
svn merge ^/trunk/blender -r41961:41998
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 92c32470057..a25ed938c0f 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -112,9 +112,8 @@ typedef struct uiStyle { short buttonspacex; short buttonspacey; short panelspace; - short panelouter; - short pad[1]; + short pad[2]; } uiStyle; typedef struct uiWidgetColors { @@ -139,6 +138,12 @@ typedef struct uiWidgetStateColors { float blend, pad; } uiWidgetStateColors; +typedef struct uiPanelColors { + char header[4]; + short show_header; + short pad; +} uiPanelColors; + typedef struct ThemeUI { /* Interface Elements (buttons, menus, icons) */ @@ -149,9 +154,13 @@ typedef struct ThemeUI { uiWidgetColors wcol_box, wcol_scroll, wcol_progress, wcol_list_item; uiWidgetStateColors wcol_state; - + + uiPanelColors panel; + char iconfile[80]; // FILE_MAXFILE length - + float icon_alpha; + + float pad; } ThemeUI; /* try to put them all in one, if needed a special struct can be created as well |