diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 09:24:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 09:24:12 +0300 |
commit | 65344a6d1980082383993eaebf94b5647834c55c (patch) | |
tree | e97e12f9f04516e9499267966dbd09f98160f516 /source/blender/makesdna/DNA_userdef_types.h | |
parent | 52c23021c4367511969c5868ea04e61fb49e94d3 (diff) | |
parent | 18888b7b0c3556d3a2177fe7693fda02bf2a8cb5 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index cdfcf5598e8..e7a540f9afc 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -862,7 +862,8 @@ typedef enum eOpenGL_AntiAliasMethod { /* text draw options * UserDef.text_render */ typedef enum eText_Draw_Options { - USER_TEXT_DISABLE_AA = (1 << 0), + USER_TEXT_DISABLE_AA = (1 << 0), + USER_TEXT_DISABLE_HINTING = (1 << 1), } eText_Draw_Options; /* tw_flag (transform widget) */ |