diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:37:11 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-04 18:37:11 +0300 |
| commit | ff5fa0df18b6f03f5c9412756b001b19ac36585e (patch) | |
| tree | ec38b9b56845aadf265d9bf6ca3f3cd701a59fc6 /source/blender/makesdna/DNA_object_types.h | |
| parent | 62b139385a1a4c59dc966b4ffdfe0c6e1fb92690 (diff) | |
| parent | bf7e8b42fa269c310e456fa55263ff2d9849804e (diff) | |
Merge branch 'strand_editmode' into alembic
Conflicts:
source/blender/editors/space_view3d/drawstrands.c
source/blender/editors/space_view3d/view3d_intern.h
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index c149ef8253a..f43bf28c060 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -711,10 +711,12 @@ typedef enum ObjectMode { OB_MODE_TEXTURE_PAINT = 1 << 4, OB_MODE_PARTICLE_EDIT = 1 << 5, OB_MODE_POSE = 1 << 6, + OB_MODE_HAIR_EDIT = 1 << 7, } ObjectMode; /* 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) +#define OB_MODE_ALL_BRUSH (OB_MODE_ALL_PAINT | OB_MODE_HAIR_EDIT) #define MAX_DUPLI_RECUR 8 |