[Bf-blender-cvs] [829b305a680] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 829b305a6805b2a84dafd75b29680d21a3223c16
Author: Antonio Vazquez
Date:   Mon Jun 29 15:52:35 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB829b305a6805b2a84dafd75b29680d21a3223c16

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 2abfb392711,882ab1f983a..6afd2ad3548
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -3756,11 -3760,8 +3765,11 @@@ static int gpencil_draw_modal(bContext 
         * the 0.15 value gets a good result in Windows and Linux. */
        if (!is_speed_guide && (size_after - size_before > 1)) {
          for (int r = 0; r < 5; r++) {
-           gp_smooth_segment(p->gpd, 0.15f, size_before - 1, size_after - 1);
+           gpencil_smooth_segment(p->gpd, 0.15f, size_before - 1, size_after - 1);
          }
 +        /* Spread the points if needed. */
 +        ED_gpencil_stroke_buffer_spread_segment(
 +            p->brush, &p->gsc, size_before - 1, size_after - 1);
        }
  
        /* finish painting operation if anything went wrong just now */