[Bf-blender-cvs] [73e9ae608c8] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 73e9ae608c8e03a4fc0cbcaca09c3ca9d1b0131b
Author: Bastien Montagne
Date:   Sat Sep 8 15:32:44 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB73e9ae608c8e03a4fc0cbcaca09c3ca9d1b0131b

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/lattice.c

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



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