diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 14:53:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 14:58:13 +0300 |
| commit | 486e2547eea3f12bfde70f2526dde08f39a8722b (patch) | |
| tree | c65c06162d46436c45c1972877d0b4163980411d /source/blender/makesdna/DNA_object_types.h | |
| parent | a3409d3f53f1decb3cbe5c04fd804062dcf2cf49 (diff) | |
DNA: move eObjectMode into own header
Add a enum headers to DNA, to be included in other headers
so function signatures can use enums for better type safety.
Add DNA_*_enums.h matching DNA_*.types.h as needed.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index a9c36007d9c..e0b4d117bd1 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -33,6 +33,8 @@ #ifndef __DNA_OBJECT_TYPES_H__ #define __DNA_OBJECT_TYPES_H__ +#include "DNA_object_enums.h" + #include "DNA_defs.h" #include "DNA_listBase.h" #include "DNA_ID.h" @@ -671,26 +673,7 @@ enum { OB_LOCK_ROTW = 1 << 9, OB_LOCK_ROT4D = 1 << 10, }; - -/* ob->mode */ -typedef enum eObjectMode { - OB_MODE_OBJECT = 0, - OB_MODE_EDIT = 1 << 0, - OB_MODE_SCULPT = 1 << 1, - OB_MODE_VERTEX_PAINT = 1 << 2, - OB_MODE_WEIGHT_PAINT = 1 << 3, - OB_MODE_TEXTURE_PAINT = 1 << 4, - OB_MODE_PARTICLE_EDIT = 1 << 5, - OB_MODE_POSE = 1 << 6, - OB_MODE_GPENCIL = 1 << 7, /* NOTE: Just a dummy to make the UI nicer */ -} eObjectMode; - -/* any mode where the brush system is used */ -#define OB_MODE_ALL_PAINT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT) - -/* any mode that uses ob->sculpt */ -#define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT) - + #define MAX_DUPLI_RECUR 8 #ifdef __cplusplus |