[Bf-blender-cvs] [865bb3f9484] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonioya]

Commit: 865bb3f94847b008a150f2ed09df52cb6b05f6e5
Author: Antonioya
Date:   Wed Apr 17 18:09:12 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB865bb3f94847b008a150f2ed09df52cb6b05f6e5

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/versioning_280.c
	source/blender/draw/engines/gpencil/gpencil_engine.h

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



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