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

[Antonioya]

Commit: cee3b7b2d9d22242c85f30ee751ef63225f357fc
Author: Antonioya
Date:   Wed Feb 6 10:02:51 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBcee3b7b2d9d22242c85f30ee751ef63225f357fc

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_render.c

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



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