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

[Antonio Vazquez]

Commit: dbf89fdd7a47b1f95a147539a2769d310bf48aed
Author: Antonio Vazquez
Date:   Tue Apr 18 19:22:00 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdbf89fdd7a47b1f95a147539a2769d310bf48aed

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 72d76fbc81f,af557ec0872..36e6ec4a01f
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -524,7 -486,7 +524,8 @@@ static short gp_stroke_addpoint(tGPsdat
  	bGPdata *gpd = p->gpd;
  	bGPDbrush *brush = p->brush;
  	tGPspoint *pt;
+ 	ToolSettings *ts = p->scene->toolsettings;
 +	Object *obact = (Object *)p->ownerPtr.data;
  
  	/* check painting mode */
  	if (p->paintmode == GP_PAINTMODE_DRAW_STRAIGHT) {