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/editors/interface/resources.c | |
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/editors/interface/resources.c')
-rw-r--r-- | source/blender/editors/interface/resources.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 2eae452debb..788c5fb3913 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -2923,7 +2923,7 @@ void init_userdef_do_versions(void) USER_FLAG_DEPRECATED_6 | USER_FLAG_DEPRECATED_7 | USER_FLAG_DEPRECATED_9 | USER_FLAG_DEPRECATED_10); U.uiflag &= ~( - USER_UIFLAG_DEPRECATED_7); + USER_LOCK_UI_LAYOUT); U.transopts &= ~( USER_TR_DEPRECATED_2 | USER_TR_DEPRECATED_3 | USER_TR_DEPRECATED_4 | USER_TR_DEPRECATED_6 | USER_TR_DEPRECATED_7); |