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

[Antonio Vazquez]

Commit: f3bf30d0401c9ca685ba43a6ecc8591eb0eccbef
Author: Antonio Vazquez
Date:   Fri Sep 13 15:59:27 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf3bf30d0401c9ca685ba43a6ecc8591eb0eccbef

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/makesdna/DNA_brush_types.h

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



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