Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-07-28 23:25:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-07-28 23:27:40 +0300
commit214bbd4c027518c24bcd8e7eaf5226453e2e978c (patch)
tree5e7888bb82d4de4370e35285e846896a3b38e604 /source/blender/editors
parentf3782c0a9e44cc56680b0682d0eb78d2974bb593 (diff)
Replace magic numbers with deprecated names
The names aren't meaningful but means it wont accidentally use valid names. Also remove textured-font setting
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/resources.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index fdeafedc328..4b47d0da13e 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2761,17 +2761,17 @@ void init_userdef_do_versions(void)
if (!USER_VERSION_ATLEAST(278, 6)) {
/* Clear preference flags for re-use. */
U.flag &= ~(
- (1 << 1) | (1 << 2) | (1 << 3) |
- (1 << 6) | (1 << 7) |
- (1 << 9) | (1 << 10));
+ USER_FLAG_DEPRECATED_1 | USER_FLAG_DEPRECATED_2 | USER_FLAG_DEPRECATED_3 |
+ USER_FLAG_DEPRECATED_6 | USER_FLAG_DEPRECATED_7 |
+ USER_FLAG_DEPRECATED_9 | USER_FLAG_DEPRECATED_10);
U.uiflag &= ~(
- (1 << 7));
+ USER_UIFLAG_DEPRECATED_7);
U.transopts &= ~(
- (1 << 2) | (1 << 3) | (1 << 4) |
- (1 << 7));
+ USER_TR_DEPRECATED_2 | USER_TR_DEPRECATED_3 | USER_TR_DEPRECATED_4 |
+ USER_TR_DEPRECATED_6 | USER_TR_DEPRECATED_7);
U.gameflags &= ~(
- (1 << 0) | (1 << 1) |
- (1 << 3) | (1 << 4));
+ USER_GL_RENDER_DEPRECATED_0 | USER_GL_RENDER_DEPRECATED_1 |
+ USER_GL_RENDER_DEPRECATED_3 | USER_GL_RENDER_DEPRECATED_4);
U.uiflag |= USER_LOCK_CURSOR_ADJUST;
}