diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-29 09:32:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-29 09:32:20 +0300 |
| commit | da885b922c1c2aeed8776504bad57e8e3bb2c2e6 (patch) | |
| tree | 984b7d27bacae70d728c5d857dd7dc4af7d67fa3 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | 045f3bda6434cb15c9f1dab15c669cc22b4d815f (diff) | |
| parent | 79639ccd6b118d14fdf43998032226ebf54a2b3e (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 281c16ac892..caaf862a12f 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -687,12 +687,12 @@ typedef enum eUserpref_UI_Flag { USER_UIFLAG_DEPRECATED_7 = (1 << 7), USER_ALLWINCODECS = (1 << 8), USER_MENUOPENAUTO = (1 << 9), - USER_ZBUF_CURSOR = (1 << 10), + USER_DEPTH_CURSOR = (1 << 10), USER_AUTOPERSP = (1 << 11), USER_LOCKAROUND = (1 << 12), USER_GLOBALUNDO = (1 << 13), USER_ORBIT_SELECTION = (1 << 14), - USER_ZBUF_ORBIT = (1 << 15), + USER_DEPTH_NAVIGATE = (1 << 15), USER_HIDE_DOT = (1 << 16), USER_SHOW_ROTVIEWICON = (1 << 17), USER_SHOW_VIEWPORTNAME = (1 << 18), |