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

[Antonio Vazquez]

Commit: 17c8b2e4a8eb7e488135caf4666fc29d502b8703
Author: Antonio Vazquez
Date:   Tue Apr 10 09:39:06 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB17c8b2e4a8eb7e488135caf4666fc29d502b8703

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/editors/transform/transform.c

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



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