[Bf-blender-cvs] [c9a546ae312] soc-2019-npr: Merge remote-tracking branch 'origin/master' into soc-2019-npr

[YimingWu]

Commit: c9a546ae312a836f048de422a208548d5eb68e01
Author: YimingWu
Date:   Wed Aug 7 09:03:23 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc9a546ae312a836f048de422a208548d5eb68e01

Merge remote-tracking branch 'origin/master' into soc-2019-npr

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



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

diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index c19512b6ab6,357e36a06b2..5fc486f1fe6
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@@ -118,22 -118,19 +118,29 @@@ static void deformStroke(GpencilModifie
        continue;
      }
  
 +    if ((mmd->flag & GP_THICK_CUSTOM_CURVE) && (mmd->curve_thickness)) {
 +      /* normalize value to evaluate curve */
 +      float value = (float)i / (gps->totpoints - 1);
 +      curvef = curvemapping_evaluateF(mmd->curve_thickness, 0, value);
 +    }
 +
 +    float new_pressure = weight * curvef;
 +
      if (mmd->flag & GP_THICK_NORMALIZE) {
 -      pt->pressure = 1.0f;
 +      pt->pressure = 1.0f * new_pressure;
      }
      else {
-       pt->pressure += mmd->thickness * new_pressure;
+       if ((mmd->flag & GP_THICK_CUSTOM_CURVE) && (mmd->curve_thickness)) {
+         /* normalize value to evaluate curve */
+         float value = (float)i / (gps->totpoints - 1);
+         curvef = BKE_curvemapping_evaluateF(mmd->curve_thickness, 0, value);
+       }
+ 
+       pt->pressure += mmd->thickness * weight * curvef;
+       CLAMP_MIN(pt->pressure, 0.1f);
      }
 +
 +    CLAMP_MIN(pt->pressure, 0.1f);
    }
  }