Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / interface / resources.c
index 2eae452debb358bb1aca508bb5744b683a724711..788c5fb3913f4b7ec3b8fd30096cc0a93bca20f6 100644 (file)
@@ -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);