diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:06:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:06:23 +0300 |
| commit | 5376c739f5bf4029e0a32946e9945a732feba217 (patch) | |
| tree | b3494e69541d22edf5b971106b532e3a2a2577cd /source/blender/makesdna/DNA_object_types.h | |
| parent | 98dcd33238e44984d31d96e2ffd0191a5d1cf7b6 (diff) | |
| parent | 486e2547eea3f12bfde70f2526dde08f39a8722b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 7c3ef5e72be..17ee64fd7d8 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" @@ -711,25 +713,6 @@ enum { OB_DUPLI_FLAG_RENDER = 1 << 1, }; -/* 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 |