[Bf-blender-cvs] [7960f27df1a] greasepencil-object: GPencil: More test of the Chisel brush

[Antonio Vazquez]

Commit: 7960f27df1af1bf90fd598cacc7b3732bd5432e9
Author: Antonio Vazquez
Date:   Sat May 2 16:21:21 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7960f27df1af1bf90fd598cacc7b3732bd5432e9

GPencil: More test of the Chisel brush

===================================================================

M	source/blender/editors/gpencil/gpencil_paint.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 7239c7fbdff..cb72553c68b 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -519,7 +519,6 @@ static void gp_brush_angle(bGPdata *gpd, Brush *brush, tGPspoint *pt, const floa
   float mvec[2];
   float sen = brush->gpencil_settings->draw_angle_factor; /* sensitivity */
   float fac;
-  float mpressure;
 
   /* default angle of brush in radians */
   float angle = brush->gpencil_settings->draw_angle;
@@ -547,9 +546,7 @@ static void gp_brush_angle(bGPdata *gpd, Brush *brush, tGPspoint *pt, const floa
 
     fac = 1.0f - fabs(dot_v2v2(v0, mvec)); /* 0.0 to 1.0 */
     /* interpolate with previous point for smoother transitions */
-    mpressure = interpf(pt->pressure - (sen * fac), (pt - 1)->pressure, 0.3f);
-    pt->pressure = mpressure;
-
+    pt->pressure = interpf(pt->pressure - (sen * fac), (pt - 1)->pressure, 0.3f);
     CLAMP(pt->pressure, GPENCIL_ALPHA_OPACITY_THRESH, 1.0f);
   }
 }
@@ -3235,8 +3232,9 @@ static void gp_brush_angle_segment(tGPsdata *p, tGPspoint *pt_prev, tGPspoint *p
   mvec[1] = pt->y - pt_prev->y;
   normalize_v2(mvec);
   fac = 1.0f - fabs(dot_v2v2(v0, mvec)); /* 0.0 to 1.0 */
-  pt->pressure = pt->pressure - (sen * fac);
-  CLAMP(pt->pressure, pt_prev->pressure * 0.1f, 1.0f);
+  /* interpolate with previous point for smoother transitions */
+  pt->pressure = interpf(pt->pressure - (sen * fac), pt_prev->pressure, 0.3f);
+  CLAMP(pt->pressure, GPENCIL_ALPHA_OPACITY_THRESH, 1.0f);
 }
 
 /* Add arc points between two mouse events using the previous segment to determine the vertice of
@@ -3336,7 +3334,7 @@ static void gpencil_add_arc_points(tGPsdata *p, float mval[2], int segments)
     /* Apply angle of stroke to brush size to interpolated points but slightly attenuated.. */
     if (brush_settings->draw_angle_factor != 0.0f) {
       gp_brush_angle_segment(p, pt_step, pt);
-      CLAMP(pt->pressure, pt_prev->pressure * 0.6f, 1.0f);
+      CLAMP(pt->pressure, pt_prev->pressure * 0.5f, 1.0f);
       /* Use the previous interpolated point for next segment. */
       pt_step = pt;
     }