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

[Antonio Vazquez]

Commit: 3d67dd939f1cd77feca3f5dc45798dac3f393037
Author: Antonio Vazquez
Date:   Wed Sep 25 16:18:07 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3d67dd939f1cd77feca3f5dc45798dac3f393037

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/editors/gpencil/gpencil_paint.c

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



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