[Bf-blender-cvs] [60c4e20d9f6] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 60c4e20d9f6ac6e43b40e58b1632ce4194741127
Author: Antonio Vazquez
Date:   Sun May 20 11:19:52 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB60c4e20d9f6ac6e43b40e58b1632ce4194741127

Merge branch 'blender2.8' into greasepencil-object

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



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