archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: deprecated flags to named DNA flags

Browse Source
This commit is contained in:
Campbell Barton
2019-03-15 10:42:39 +11:00
parent 35b78d9807
commit 18e0c5ea5b
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenloader/intern/versioning_280.c
View File

@@ -2869,8 +2869,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
} }
LISTBASE_FOREACH (Text *, text, &bmain->texts) { LISTBASE_FOREACH (Text *, text, &bmain->texts) {
enum { TXT_READONLY = 1 << 8, TXT_FOLLOW = 1 << 9}; text->flags &= ~(TXT_FLAG_DEPRECATED_8 | TXT_FLAG_DEPRECATED_9);
text->flags &= ~(TXT_READONLY | TXT_FOLLOW);
} }
} }

18
source/blender/makesdna/DNA_text_types.h
View File

@@ -59,10 +59,18 @@ typedef struct Text {
#define TXT_MAX_UNDO (TXT_INIT_UNDO*TXT_INIT_UNDO) #define TXT_MAX_UNDO (TXT_INIT_UNDO*TXT_INIT_UNDO)
/* text flags */ /* text flags */
#define TXT_ISDIRTY (1 << 0) enum {
#define TXT_ISMEM (1 << 2) TXT_ISDIRTY = 1 << 0,
#define TXT_ISEXT (1 << 3) TXT_ISMEM = 1 << 2,
#define TXT_ISSCRIPT (1 << 4) /* used by space handler scriptlinks */ TXT_ISEXT = 1 << 3,
#define TXT_TABSTOSPACES (1 << 10) /* use space instead of tabs */ /** 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__ */ #endif /* __DNA_TEXT_TYPES_H__ */