diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-09-10 18:46:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-09-10 18:51:15 +0300 |
| commit | 2f4153396cf8aa35d99899b0f28fb194b2fd34c0 (patch) | |
| tree | 32d6a941e1334f2aa64ce75761ba0a8d6a1843bd /source/blender/makesdna/DNA_brush_types.h | |
| parent | 5ba0726bc1a7c7343e9d31e01c15bb3510256bb7 (diff) | |
Cleanup: no need to add Brush.flag2
Also use 'use_' prefix for RNA booleans.
Diffstat (limited to 'source/blender/makesdna/DNA_brush_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 5901163c3a9..3aafe5a1ddb 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -244,8 +244,6 @@ typedef struct Brush { int size; /** General purpose flag. */ int flag; - int flag2; - char _pad[4]; /** Pressure influence for mask. */ int mask_pressure; /** Jitter the position of the brush. */ @@ -282,7 +280,7 @@ typedef struct Brush { /** Source for fill tool color gradient application. */ char gradient_fill_mode; - char _pad0; + char _pad; /** Projection shape (sphere, circle). */ char falloff_shape; float falloff_angle; @@ -291,6 +289,7 @@ typedef struct Brush { char sculpt_tool; /** Active sculpt tool. */ char uv_sculpt_tool; + /** Active vertex paint. */ char vertexpaint_tool; /** Active weight paint. */ char weightpaint_tool; @@ -300,7 +299,7 @@ typedef struct Brush { char mask_tool; /** Active grease pencil tool. */ char gpencil_tool; - char _pad1[1]; + char _pad0[1]; float autosmooth_factor; @@ -319,7 +318,7 @@ typedef struct Brush { int curve_preset; int automasking_flags; - char _pad2[4]; + char _pad1[4]; int elastic_deform_type; float elastic_deform_compressibility; @@ -405,7 +404,7 @@ typedef enum eBrushFlags { BRUSH_JITTER_PRESSURE = (1 << 4), BRUSH_SPACING_PRESSURE = (1 << 5), BRUSH_FLAG_UNUSED_6 = (1 << 6), /* cleared */ - BRUSH_FLAG_UNUSED_7 = (1 << 7), /* cleared */ + BRUSH_GRAB_ACTIVE_VERTEX = (1 << 7), BRUSH_ANCHORED = (1 << 8), BRUSH_DIR_IN = (1 << 9), BRUSH_SPACE = (1 << 10), @@ -432,10 +431,6 @@ typedef enum eBrushFlags { BRUSH_CURVE = (1u << 31), } eBrushFlags; -typedef enum eBrushFlags2 { - BRUSH_GRAB_ACTIVE_VERTEX = (1 << 0), -} eBrushFlags2; - typedef enum { BRUSH_MASK_PRESSURE_RAMP = (1 << 1), BRUSH_MASK_PRESSURE_CUTOFF = (1 << 2), |