Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 May 2018 09:15:31 +0000 (11:15 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 May 2018 09:15:31 +0000 (11:15 +0200)
commit83345b463edba7db15a30c33d0f44a55c9d173a1
tree3b8ad3af002509a2de8e6ab6a8d2fdaa0fdf329f
parente3d30ffb9205a4974ecc551a1a2af842622855b6
parenta3b4c3823ca7e16e6414a1dc39454a18fddb8e77
Merge branch 'master' into blender2.8