[Bf-blender-cvs] [cfe8d5f255a] greasepencil-refactor: Merge branch 'greasepencil-object' into greasepencil-refactor

[Antonio Vazquez]

Commit: cfe8d5f255aea6bb6ecf0649424a093c2f50b8ba
Author: Antonio Vazquez
Date:   Thu Jan 23 16:58:21 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBcfe8d5f255aea6bb6ecf0649424a093c2f50b8ba

Merge branch 'greasepencil-object' into greasepencil-refactor

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



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

diff --cc source/blender/editors/gpencil/gpencil_sculpt_paint.c
index f815384d1a5,94598314ba3..cce6bdb8d36
--- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c
+++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c
@@@ -404,9 -412,9 +405,9 @@@ static bool gp_brush_strength_apply(tGP
    /* Strength should stay within [0.0, 1.0] */
    CLAMP(pt->strength, 0.0f, 1.0f);
  
+   /* smooth the strength */
 -  BKE_gpencil_smooth_stroke_strength(gps, pt_index, inf);
++  BKE_gpencil_stroke_smooth_strength(gps, pt_index, inf);
+ 
    return true;
  }