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

[Antonio Vazquez]

Commit: d853f7459632162b0eac1fb77350a78ecd80f645
Author: Antonio Vazquez
Date:   Fri Aug 16 21:24:07 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd853f7459632162b0eac1fb77350a78ecd80f645

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/editors/gpencil/gpencil_edit.c

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



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