[Bf-blender-cvs] [76474b09d09] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 76474b09d09ea2cb90d10f8b11917f7b01987158
Author: Antonio Vazquez
Date:   Wed Sep 6 16:09:05 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB76474b09d09ea2cb90d10f8b11917f7b01987158

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_interpolate.c
index d0f78591a55,83e2a85db49..d5fc329a635
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@@ -117,11 -117,9 +117,11 @@@ static void gp_interpolate_update_point
  		
  		/* Interpolate all values */
  		interp_v3_v3v3(&pt->x, &prev->x, &next->x, factor);
- 		pt->pressure = interpf(prev->pressure, next->pressure, factor);
- 		pt->strength = interpf(prev->strength, next->strength, factor);
+ 		pt->pressure = interpf(prev->pressure, next->pressure, 1.0f - factor);
+ 		pt->strength = interpf(prev->strength, next->strength, 1.0f - factor);
  		CLAMP(pt->strength, GPENCIL_STRENGTH_MIN, 1.0f);
 +		pt->totweight = 0;
 +		pt->weights = NULL;
  	}
  }