Commit: 09305099d09ca5a3c1b8ca6ef49c06dc80bebdac
Author: Antonio Vazquez
Date: Thu Oct 31 17:47:14 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB09305099d09ca5a3c1b8ca6ef49c06dc80bebdac
GPencil: Double Random Pressure effect
===================================================================
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index 066e7c2e975..66de67d868b 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -791,11 +791,11 @@ static short gp_stroke_addpoint(tGPsdata *p, const float
mval[2], float pressure
float tmp_pressure = BKE_curvemapping_evaluateF(
brush->gpencil_settings->curve_sensitivity, 0, pressure);
if (BLI_rng_get_float(p->rng) > 0.5f) {
- pt->pressure -= tmp_pressure *
brush->gpencil_settings->draw_random_press *
+ pt->pressure -= tmp_pressure *
(brush->gpencil_settings->draw_random_press * 2.0f) *
BLI_rng_get_float(p->rng);
}
else {
- pt->pressure += tmp_pressure *
brush->gpencil_settings->draw_random_press *
+ pt->pressure += tmp_pressure *
(brush->gpencil_settings->draw_random_press * 2.0f) *
BLI_rng_get_float(p->rng);
}
CLAMP(pt->pressure, GPENCIL_STRENGTH_MIN, 1.0f);
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c
b/source/blender/editors/gpencil/gpencil_primitive.c
index 86d307a2fdf..fbd26b10021 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -940,10 +940,10 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
if ((brush->gpencil_settings->flag & GP_BRUSH_GROUP_RANDOM) &&
(brush->gpencil_settings->draw_random_press > 0.0f)) {
if (p2d->rnd[0] > 0.5f) {
- pressure -= brush->gpencil_settings->draw_random_press * p2d->rnd[1];
+ pressure -= (brush->gpencil_settings->draw_random_press * 2.0f) *
p2d->rnd[1];
}
else {
- pressure += brush->gpencil_settings->draw_random_press * p2d->rnd[2];
+ pressure += (brush->gpencil_settings->draw_random_press * 2.0f) *
p2d->rnd[2];
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
