Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 8 Sep 2018 13:32:44 +0000 (15:32 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 8 Sep 2018 13:32:44 +0000 (15:32 +0200)
Conflicts:
source/blender/blenkernel/intern/lattice.c


Trivial merge