From 4dce18fb51f17269161d1c2a16571502b97a860b Mon Sep 17 00:00:00 2001 From: Antonioya Date: Thu, 18 Apr 2019 14:19:00 +0200 Subject: GPencil: Add option to mix color with texture This was already supported in Fill, but not in Strokes. This adds more artistic options when use textured strokes. --- source/blender/makesdna/DNA_material_types.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender/makesdna/DNA_material_types.h') diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 882653ab73e..02f8245413d 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -96,7 +96,9 @@ typedef struct MaterialGPencilStyle { /** Type of gradient. */ int gradient_type; - char _pad[4]; + + /** Factor used to mix texture and stroke color. */ + float mix_stroke_factor; } MaterialGPencilStyle; /* MaterialGPencilStyle->flag */ @@ -111,8 +113,8 @@ typedef enum eMaterialGPencilStyle_Flag { GP_STYLE_COLOR_ONIONSKIN = (1 << 3), /* clamp texture */ GP_STYLE_COLOR_TEX_CLAMP = (1 << 4), - /* mix texture */ - GP_STYLE_COLOR_TEX_MIX = (1 << 5), + /* mix fill texture */ + GP_STYLE_FILL_TEX_MIX = (1 << 5), /* Flip fill colors */ GP_STYLE_COLOR_FLIP_FILL = (1 << 6), /* Stroke Texture is a pattern */ @@ -123,6 +125,8 @@ typedef enum eMaterialGPencilStyle_Flag { GP_STYLE_FILL_SHOW = (1 << 9), /* Don't rotate dots/boxes */ GP_STYLE_COLOR_LOCK_DOTS = (1 << 10), + /* mix stroke texture */ + GP_STYLE_STROKE_TEX_MIX = (1 << 11), } eMaterialGPencilStyle_Flag; typedef enum eMaterialGPencilStyle_Mode { -- cgit v1.2.3