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

[Antonio Vazquez]

Commit: 76567d6817279817cfaffeb21f5c4618a74213f8
Author: Antonio Vazquez
Date:   Thu Dec 19 14:41:30 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB76567d6817279817cfaffeb21f5c4618a74213f8

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_paint_common.py
	release/scripts/startup/bl_ui/space_view3d.py

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



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