diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-12-02 13:30:53 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-20 13:21:58 +0300 |
| commit | 7ae6492c85c7c6da6e3d0f6e1239436a2fd3ce6e (patch) | |
| tree | 360a0efc7166c27fbd818ee24755d785524b9948 /source/blender/makesdna/DNA_object_types.h | |
| parent | 7779166313f17db1c8175c27fb4d352e111e2174 (diff) | |
Lots of small fixes for paint system quirks to make hair brushes work
in the UI.
Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/transform/manipulator_widget.c
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 9cf69ae095e..4491cfa5203 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -678,6 +678,7 @@ typedef enum 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 |