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

[Antonio Vazquez]

Commit: e6de4648b21ea34fd385eb14e75a4b49cb5f5acc
Author: Antonio Vazquez
Date:   Tue Jun 16 17:39:03 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe6de4648b21ea34fd385eb14e75a4b49cb5f5acc

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_operators/__init__.py
	source/blender/blenkernel/intern/gpencil_geom.c

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



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