From a4a9123c33c822d13822a312cf2064ef2aca7a32 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Tue, 20 Nov 2018 20:05:13 +0100 Subject: GP: Refactor target weight paint Now, the target weight is defined as the final maximum value with a new property and all fields have be moved to brush struct. --- source/blender/makesdna/DNA_scene_types.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/makesdna/DNA_scene_types.h') diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 640fe526971..6737420b97c 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -995,6 +995,8 @@ typedef struct GP_Sculpt_Data { float strength; /* strength of effect */ float curcolor_add[3]; /* cursor color for add */ float curcolor_sub[3]; /* cursor color for sub */ + float target_weight; /* target weight */ + char pad_[4]; } GP_Sculpt_Data; /* GP_Sculpt_Data.flag */ @@ -1015,6 +1017,8 @@ typedef enum eGP_Sculpt_Flag { GP_SCULPT_FLAG_TMP_INVERT = (1 << 5), /* adjust radius using pen pressure */ GP_SCULPT_FLAG_PRESSURE_RADIUS = (1 << 6), + /* paint weight, define a target */ + GP_SCULPT_FLAG_TARGET_WEIGHT = (1 << 7), } eGP_Sculpt_Flag; /* GPencil Stroke Sculpting Settings */ @@ -1051,8 +1055,6 @@ typedef enum eGP_Sculpt_SettingsFlag { GP_SCULPT_SETT_FLAG_FRAME_FALLOFF = (1 << 5), /* apply brush to uv data */ GP_SCULPT_SETT_FLAG_APPLY_UV = (1 << 6), - /* paint weight, not add/substract */ - GP_SCULPT_SETT_FLAG_PAINT_WEIGHT = (1 << 7), } eGP_Sculpt_SettingsFlag; /* Settings for GP Interpolation Operators */ -- cgit v1.2.3