diff options
| author | Pablo Dobarro <pablodp606@gmail.com> | 2019-10-31 16:46:47 +0300 |
|---|---|---|
| committer | Pablo Dobarro <pablodp606@gmail.com> | 2019-10-31 16:46:47 +0300 |
| commit | cca61a0fe2b67c7e4fe9e11e1849aea1a380971c (patch) | |
| tree | ee362efbfb11b5ea4f94c929f235d7e29b09c3fa /source/blender/makesdna | |
| parent | 26e454eec34c615cf8d5edec2fa59ac2312ec716 (diff) | |
| parent | cd827194f7cc771e9947d474ba0e7c4ae2a2aa9a (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_brush_defaults.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_brush_defaults.h b/source/blender/makesdna/DNA_brush_defaults.h index 714c205cda2..b2d4124a348 100644 --- a/source/blender/makesdna/DNA_brush_defaults.h +++ b/source/blender/makesdna/DNA_brush_defaults.h @@ -34,6 +34,7 @@ { \ .blend = 0, \ .flag = (BRUSH_ALPHA_PRESSURE | BRUSH_SPACE | BRUSH_SPACE_ATTEN), \ + .sampling_flag = (BRUSH_PAINT_ANTIALIASING), \ \ .ob_mode = OB_MODE_ALL_PAINT, \ \ diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index fc8763f1519..63fbf576bba 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -245,8 +245,9 @@ typedef struct Brush { float weight; /** Brush diameter. */ int size; - /** General purpose flag. */ + /** General purpose flags. */ int flag; + int sampling_flag; /** Pressure influence for mask. */ int mask_pressure; /** Jitter the position of the brush. */ @@ -283,7 +284,7 @@ typedef struct Brush { /** Source for fill tool color gradient application. */ char gradient_fill_mode; - char _pad; + char _pad[5]; /** Projection shape (sphere, circle). */ char falloff_shape; float falloff_angle; @@ -435,6 +436,11 @@ typedef enum eBrushFlags { BRUSH_CURVE = (1u << 31), } eBrushFlags; +/* Brush.sampling_flag */ +typedef enum eBrushSamplingFlags { + BRUSH_PAINT_ANTIALIASING = (1 << 0), +} eBrushSamplingFlags; + typedef enum { BRUSH_MASK_PRESSURE_RAMP = (1 << 1), BRUSH_MASK_PRESSURE_CUTOFF = (1 << 2), |