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

[Antonio Vazquez]

Commit: 712442eec015ef6e3d95d6299cf099a5e687a792
Author: Antonio Vazquez
Date:   Thu May 7 15:19:08 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB712442eec015ef6e3d95d6299cf099a5e687a792

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
	release/scripts/startup/bl_ui/space_view3d_toolbar.py
	source/blender/makesrna/intern/rna_brush.c

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



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