diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-11 16:35:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-11 16:35:36 +0300 |
| commit | c36f4a7f7f370ebb6e944d9893d2677232d3b7f8 (patch) | |
| tree | c2030541dcaae70b2892c6838e8a3e76e24843e1 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | cc63c8511cb18cc59fb2874dd5a57d89b7123bac (diff) | |
| parent | b415ed55a74c51b944cd0682fc7a81679778ac8f (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/blender.c
source/blender/makesdna/DNA_ID.h
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 89761ee6ced..237091e1391 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -679,7 +679,9 @@ typedef enum eUserpref_UI_Flag { USER_DRAWVIEWINFO = (1 << 4), USER_PLAINMENUS = (1 << 5), USER_LOCK_CURSOR_ADJUST = (1 << 6), - USER_UIFLAG_DEPRECATED_7 = (1 << 7), /* cleared */ + /* Avoid accidentally adjusting the layout + * (exact behavior may change based on whats considered reasonable to lock down). */ + USER_LOCK_UI_LAYOUT = (1 << 7), USER_ALLWINCODECS = (1 << 8), USER_MENUOPENAUTO = (1 << 9), USER_ZBUF_CURSOR = (1 << 10), |