diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
| commit | 94ae0232b0337ab70cecaef03cd845887cd36eaa (patch) | |
| tree | caea2819c7fe0400fb91c9bdf0e99a9e0fd50cf6 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 9a109c22ae1ef8a5c75932d661610b23ec685bd7 (diff) | |
| parent | f68e9db583489d541d535791536ea20bc1ae1d76 (diff) | |
Merged changes in the trunk up to revision 53729.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index e7f27834c85..96bf4a10dda 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -149,6 +149,13 @@ typedef struct uiPanelColors { int pad; } 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_text; @@ -210,7 +217,9 @@ typedef struct ThemeSpace { /* note, cannot use name 'panel' because of DNA mapping old files */ uiPanelColors panelcolors; - + + uiGradientColors gradients; + char shade1[4]; char shade2[4]; @@ -440,6 +449,7 @@ typedef struct UserDef { int ndof_flag; /* flags for 3D mouse */ short ogl_multisamples; /* amount of samples for OpenGL FSA, if zero no FSA */ + short pad4; float glalphaclip; |