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

[Antonio Vazquez]

Commit: 67801591f6dc034c8d02829bb386b8f1ae14487b
Author: Antonio Vazquez
Date:   Fri Apr 13 15:54:39 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB67801591f6dc034c8d02829bb386b8f1ae14487b

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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