diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 01:51:27 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 01:51:27 +0300 |
| commit | c7c10e5e283879961356050ba8a965d2239456b8 (patch) | |
| tree | d89d06ca30d51087a9d958f66bbf240bd3c7807e /source/blender/makesdna/DNA_brush_types.h | |
| parent | e0cf86a9e219dcd71e5d67b8f2999d41e7f8c492 (diff) | |
Brush Texture Angle Goodies:
This commit includes a few things:
* It moves the Rake and Random flags from the brush to the MTex.
* The first change allows mask textures to have independent rake
support.
* Random rotation now has an angle value that controls the width of the
effect from the rake or default angle
* Rake and Random are now supported together.
Diffstat (limited to 'source/blender/makesdna/DNA_brush_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 2fce2be8eaf..89c8316002b 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -93,7 +93,7 @@ typedef struct Brush { float plane_offset; /* offset for plane brushes (clay, flatten, fill, scrape) */ - float pad; + int flag2; int gradient_spacing; int gradient_stroke_mode; /* source for stroke color gradient application */ int gradient_fill_mode; /* source for fill tool color gradient application */ @@ -192,7 +192,7 @@ typedef enum BrushFlags { BRUSH_JITTER_PRESSURE = (1 << 4), BRUSH_SPACING_PRESSURE = (1 << 5), BRUSH_UNUSED = (1 << 6), - BRUSH_RAKE = (1 << 7), +// BRUSH_RAKE = (1 << 7), deprecated, use brush_angle_mode BRUSH_ANCHORED = (1 << 8), BRUSH_DIR_IN = (1 << 9), BRUSH_SPACE = (1 << 10), @@ -209,7 +209,7 @@ typedef enum BrushFlags { BRUSH_EDGE_TO_EDGE = (1 << 22), BRUSH_DRAG_DOT = (1 << 23), BRUSH_INVERSE_SMOOTH_PRESSURE = (1 << 24), - BRUSH_RANDOM_ROTATION = (1 << 25), +// BRUSH_RANDOM_ROTATION = (1 << 25), deprecated, use brush_angle_mode BRUSH_PLANE_TRIM = (1 << 26), BRUSH_FRONTFACE = (1 << 27), BRUSH_CUSTOM_ICON = (1 << 28), |