diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-21 20:08:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-21 20:08:23 +0300 |
| commit | 596c3368f4b09bdeec46e7b44abfc8bcb7ba8fcf (patch) | |
| tree | 09a8d4af2f134db67579577d38ad78fa667afede /source/blender/makesdna | |
| parent | 794836c8f17a2feaa43d31d23982fa41e3f953a4 (diff) | |
| parent | 34029fc71a3cc7e69f977462d4b3f09eb10ccca2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index cb2c69e2fa1..362a9232553 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -72,7 +72,7 @@ typedef struct uiFont { short blf_id; /* from blfont lib */ short uifont_id; /* own id (eUIFont_ID) */ short r_to_l; /* fonts that read from left to right */ - short hinting; + short pad; } uiFont; /* this state defines appearance of text */ @@ -865,7 +865,10 @@ typedef enum eOpenGL_AntiAliasMethod { * UserDef.text_render */ typedef enum eText_Draw_Options { USER_TEXT_DISABLE_AA = (1 << 0), - USER_TEXT_DISABLE_HINTING = (1 << 1), + + USER_TEXT_HINTING_NONE = (1 << 1), + USER_TEXT_HINTING_SLIGHT = (1 << 2), + USER_TEXT_HINTING_FULL = (1 << 3), } eText_Draw_Options; /* tw_flag (transform widget) */ |