diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 17:11:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 17:11:06 +0300 |
| commit | a989913dd4c777ac936671ab214144429087e4ad (patch) | |
| tree | 2d6a43d604b11814b731a8e76a5e2de4a7b2a6fe /source/blender/makesdna | |
| parent | 79bbbf7e200258b63c0e4e71e9a8508b11a95946 (diff) | |
| parent | c241d79dc8a8ee144bc904f0a9b039b452df44bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index e39c6c37814..070d34ef051 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -531,9 +531,13 @@ enum { /* also needed for base!!!!! or rather, they interfere....*/ /* base->flag and ob->flag */ -#define BA_WAS_SEL (1 << 1) -#define BA_HAS_RECALC_OB (1 << 2) -#define BA_HAS_RECALC_DATA (1 << 3) +enum { + BA_WAS_SEL = (1 << 1), + /* NOTE: BA_HAS_RECALC_DATA can be re-used later if freed in readfile.c. */ + // BA_HAS_RECALC_OB = (1 << 2), /* DEPRECATED */ + // BA_HAS_RECALC_DATA = (1 << 3), /* DEPRECATED */ + BA_SNAP_FIX_DEPS_FIASCO = (1 << 2), /* Yes, re-use deprecated bit, all fine since it's runtime only. */ +}; /* NOTE: this was used as a proper setting in past, so nullify before using */ #define BA_TEMP_TAG (1 << 5) |