diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-15 02:42:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-15 02:42:39 +0300 |
| commit | 18e0c5ea5b97effb9f6af28a8b069feb7be6ed86 (patch) | |
| tree | 844d25afcd5203d91a8b13444edec4c6bd56a48c /source/blender | |
| parent | 35b78d9807c49ba37e038eda85c672c72dee0247 (diff) | |
Cleanup: deprecated flags to named DNA flags
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_text_types.h | 18 |
2 files changed, 14 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 98277bab2a3..9adab610530 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2869,8 +2869,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } LISTBASE_FOREACH (Text *, text, &bmain->texts) { - enum { TXT_READONLY = 1 << 8, TXT_FOLLOW = 1 << 9}; - text->flags &= ~(TXT_READONLY | TXT_FOLLOW); + text->flags &= ~(TXT_FLAG_DEPRECATED_8 | TXT_FLAG_DEPRECATED_9); } } diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h index 34b49e29b38..4d0b849e72b 100644 --- a/source/blender/makesdna/DNA_text_types.h +++ b/source/blender/makesdna/DNA_text_types.h @@ -59,10 +59,18 @@ typedef struct Text { #define TXT_MAX_UNDO (TXT_INIT_UNDO*TXT_INIT_UNDO) /* text flags */ -#define TXT_ISDIRTY (1 << 0) -#define TXT_ISMEM (1 << 2) -#define TXT_ISEXT (1 << 3) -#define TXT_ISSCRIPT (1 << 4) /* used by space handler scriptlinks */ -#define TXT_TABSTOSPACES (1 << 10) /* use space instead of tabs */ +enum { + TXT_ISDIRTY = 1 << 0, + TXT_ISMEM = 1 << 2, + TXT_ISEXT = 1 << 3, + /** Used by space handler scriptlinks. */ + TXT_ISSCRIPT = 1 << 4, + + TXT_FLAG_DEPRECATED_8 = 1 << 8, /* cleared */ + TXT_FLAG_DEPRECATED_9 = 1 << 9, /* cleared */ + + /** Use space instead of tabs. */ + TXT_TABSTOSPACES = 1 << 10, +}; #endif /* __DNA_TEXT_TYPES_H__ */ |