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

[Antonio Vazquez]

Commit: 42e6b9217f74b6238e1495a80e52dba2a3eab681
Author: Antonio Vazquez
Date:   Fri Jun 8 10:58:21 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB42e6b9217f74b6238e1495a80e52dba2a3eab681

Merge branch 'blender2.8' into greasepencil-object

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



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