diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 09:21:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 09:21:00 +0300 |
| commit | 265b5238de738a821bed0c56fb0ef3abefae0d05 (patch) | |
| tree | 2a885fe1c94ede6df4be31ac436387cb2a6ad115 /source/blender/makesdna | |
| parent | 2597cd39982100efeeb13b597f3e432ef9346d85 (diff) | |
| parent | a8c924423e2e7103aff60c21e901dc239b54c610 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 362a9232553..10ffabd033d 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -133,11 +133,10 @@ typedef struct uiWidgetColors { char item[4]; char text[4]; char text_sel[4]; - short shaded; + char shaded; + char _pad0[7]; short shadetop, shadedown; - short alpha_check; float roundness; - float pad; } uiWidgetColors; typedef struct uiWidgetStateColors { |