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

[Antonioya]

Commit: e61479bcece95800d8f1d0dc2b91ab4a5e3acc9b
Author: Antonioya
Date:   Wed Jun 19 08:56:17 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe61479bcece95800d8f1d0dc2b91ab4a5e3acc9b

Merge branch 'master' into GP_STENCIL

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



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