diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-06 15:02:29 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-06 15:02:29 +0300 |
| commit | ebcb8223bd886fd327cddae1394436e10f1f7a73 (patch) | |
| tree | ab6f36d914d0144d56c9e461d1c68b8a6c3b7dce /source/blender/makesdna/DNA_object_types.h | |
| parent | b97214a0ba1615f5a699150736ae3e99986707f4 (diff) | |
| parent | af7fe835ffeff094df994f5e3fd75735f0514d8f (diff) | |
Merge branch 'alembic' into gooseberry
Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/key.c
source/blender/editors/object/object_shapekey.c
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesrna/intern/rna_key.c
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 feb1f772a79..e45ba79a9b4 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -723,10 +723,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 |