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

[Antonioya]

Commit: 5ef8b72d1503ceb7734dd71f59f82e58b5a600b3
Author: Antonioya
Date:   Sun Jul 29 12:24:34 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5ef8b72d1503ceb7734dd71f59f82e58b5a600b3

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	release/scripts/addons

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



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