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

[Antonio Vazquez]

Commit: 419157e3c5ad09c158c67f58c361beb3a94fc305
Author: Antonio Vazquez
Date:   Fri Sep 27 16:56:07 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB419157e3c5ad09c158c67f58c361beb3a94fc305

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/intern/brush.c

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



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