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.

1 files changed, 7 insertions, 12 deletions

diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 1710bd6be88..84a05025cd7 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -903,21 +903,16 @@ static bool gp_brush_weight_apply(
 
 	if (gp_brush_invert_check(gso)) {
 		/* reduce weight */
-		if (gso->settings->flag & GP_SCULPT_SETT_FLAG_PAINT_WEIGHT) {
-			curweight = 0.0f;
-		}
-		else {
-			curweight -= inf;
-		}
+		curweight -= inf;
 	}
 	else {
 		/* increase weight */
-		if (gso->settings->flag & GP_SCULPT_SETT_FLAG_PAINT_WEIGHT) {
-			curweight = gso->gp_brush->strength;
-		}
-		else {
-			curweight += inf;
-		}
+		curweight += inf;
+	}
+
+	/* verify target weight */
+	if (gso->gp_brush->flag & GP_SCULPT_FLAG_TARGET_WEIGHT) {
+		CLAMP_MAX(curweight, gso->gp_brush->target_weight);
 	}
 
 	CLAMP(curweight, 0.0f, 1.0f);