From 80109c976cf1f43e1f1730cb827130aa270abaaa Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 6 Nov 2018 18:06:33 +1100 Subject: Brush: split out vertex paint tool & blend mode - Vertex & weight paint now use the 'blend' setting. - Weight paint now has it's own tool setting, since weight paint doesn't deal with color - we'll likely support different tools eventually. --- source/blender/makesdna/DNA_brush_types.h | 42 ++++++++++++------------------- 1 file changed, 16 insertions(+), 26 deletions(-) (limited to 'source/blender/makesdna/DNA_brush_types.h') diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 9cf23f30287..d51c94fb536 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -205,11 +205,12 @@ typedef struct Brush { float falloff_angle; char sculpt_tool; /* active sculpt tool */ - char vertexpaint_tool; /* active vertex/weight paint blend mode (poorly named) */ + char vertexpaint_tool; /* active vertex paint */ + char weightpaint_tool; /* active weight paint */ char imagepaint_tool; /* active image paint tool */ char mask_tool; /* enum eBrushMaskTool, only used if sculpt_tool is SCULPT_TOOL_MASK */ char gpencil_tool; /* Active grease pencil tool. */ - char _pad0[7]; + char _pad0[6]; float autosmooth_factor; @@ -410,6 +411,19 @@ typedef enum eBrushImagePaintTool { PAINT_TOOL_MASK = 5 } eBrushImagePaintTool; +typedef enum eBrushVertexPaintTool { + VPAINT_TOOL_DRAW = 0, + VPAINT_TOOL_BLUR = 1, + VPAINT_TOOL_AVERAGE = 2, + VPAINT_TOOL_SMEAR = 3, +} eBrushVertexPaintTool; + +typedef enum eBrushWeightPaintTool { + WPAINT_TOOL_DRAW = 0, + WPAINT_TOOL_BLUR = 1, + WPAINT_TOOL_AVERAGE = 2, + WPAINT_TOOL_SMEAR = 3, +} eBrushWeightPaintTool; /* BrushGpencilSettings->brush type */ typedef enum eBrushGPaintTool { @@ -428,30 +442,6 @@ enum { SCULPT_DISP_DIR_Z = 4 }; -enum { - PAINT_BLEND_MIX = 0, - PAINT_BLEND_ADD = 1, - PAINT_BLEND_SUB = 2, - PAINT_BLEND_MUL = 3, - PAINT_BLEND_BLUR = 4, - PAINT_BLEND_LIGHTEN = 5, - PAINT_BLEND_DARKEN = 6, - PAINT_BLEND_AVERAGE = 7, - PAINT_BLEND_SMEAR = 8, - PAINT_BLEND_COLORDODGE = 9, - PAINT_BLEND_DIFFERENCE = 10, - PAINT_BLEND_SCREEN = 11, - PAINT_BLEND_HARDLIGHT = 12, - PAINT_BLEND_OVERLAY = 13, - PAINT_BLEND_SOFTLIGHT = 14, - PAINT_BLEND_EXCLUSION = 15, - PAINT_BLEND_LUMINOCITY = 16, - PAINT_BLEND_SATURATION = 17, - PAINT_BLEND_HUE = 18, - PAINT_BLEND_ALPHA_SUB = 19, - PAINT_BLEND_ALPHA_ADD = 20, -}; - typedef enum { BRUSH_MASK_DRAW = 0, BRUSH_MASK_SMOOTH = 1 -- cgit v1.2.3