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

[Antonio Vazquez]

Commit: 350cd7fce28321b125aa7a8672e0286c25550fa8
Author: Antonio Vazquez
Date:   Mon Mar 19 19:46:31 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB350cd7fce28321b125aa7a8672e0286c25550fa8

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	build_files/cmake/macros.cmake

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



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