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

[Antonio Vazquez]

Commit: e31a5fa567e154c588061a3d418edda3f11481f8
Author: Antonio Vazquez
Date:   Sat Nov 2 10:34:02 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe31a5fa567e154c588061a3d418edda3f11481f8

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/addons
	source/blender/editors/gpencil/gpencil_paint.c

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



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