diff options
Diffstat (limited to 'source/blender/makesdna/DNA_brush_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 67a35d4e207..c285b44c939 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -95,8 +95,12 @@ typedef struct Brush { float plane_offset; /* offset for plane brushes (clay, flatten, fill, scrape) */ int gradient_spacing; - int gradient_stroke_mode; /* source for stroke color gradient application */ - int gradient_fill_mode; /* source for fill tool color gradient application */ + char gradient_stroke_mode; /* source for stroke color gradient application */ + char gradient_fill_mode; /* source for fill tool color gradient application */ + + char pad; + char falloff_shape; /* Projection shape (sphere, circle) */ + float falloff_angle; char sculpt_tool; /* active sculpt tool */ char vertexpaint_tool; /* active vertex/weight paint blend mode (poorly named) */ @@ -181,13 +185,13 @@ typedef enum BrushGradientSourceFill { /* Brush.flag */ typedef enum BrushFlags { BRUSH_AIRBRUSH = (1 << 0), -// BRUSH_TORUS = (1 << 1), deprecated, use paint->symmetry_flags & PAINT_TILE_* + BRUSH_FLAG_DEPRECATED_1 = (1 << 1), BRUSH_ALPHA_PRESSURE = (1 << 2), BRUSH_SIZE_PRESSURE = (1 << 3), BRUSH_JITTER_PRESSURE = (1 << 4), BRUSH_SPACING_PRESSURE = (1 << 5), - BRUSH_UNUSED = (1 << 6), -// BRUSH_RAKE = (1 << 7), deprecated, use brush_angle_mode + BRUSH_FLAG_DEPRECATED_2 = (1 << 6), + BRUSH_FLAG_DEPRECATED_3 = (1 << 7), BRUSH_ANCHORED = (1 << 8), BRUSH_DIR_IN = (1 << 9), BRUSH_SPACE = (1 << 10), @@ -197,6 +201,7 @@ typedef enum BrushFlags { BRUSH_LOCK_ALPHA = (1 << 14), BRUSH_ORIGINAL_NORMAL = (1 << 15), BRUSH_OFFSET_PRESSURE = (1 << 16), + BRUSH_FLAG_DEPRECATED_4 = (1 << 17), BRUSH_SPACE_ATTEN = (1 << 18), BRUSH_ADAPTIVE_SPACE = (1 << 19), BRUSH_LOCK_SIZE = (1 << 20), @@ -204,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), deprecated, use brush_angle_mode + BRUSH_FRONTFACE_FALLOFF = (1 << 25), BRUSH_PLANE_TRIM = (1 << 26), BRUSH_FRONTFACE = (1 << 27), BRUSH_CUSTOM_ICON = (1 << 28), @@ -343,6 +348,12 @@ typedef enum BlurKernelType { KERNEL_BOX } BlurKernelType; +/* Brush.falloff_shape */ +enum { + PAINT_FALLOFF_SHAPE_SPHERE = 0, + PAINT_FALLOFF_SHAPE_TUBE = 1, +}; + #define MAX_BRUSH_PIXEL_RADIUS 500 #endif /* __DNA_BRUSH_TYPES_H__ */ |