Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 4 Aug 2018 11:43:10 +0000 (13:43 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 4 Aug 2018 11:43:10 +0000 (13:43 +0200)
commit4edae3cc2d1eecc028d3f790136ff5a0ffa8ef2f
treef51d769a5c37e38df1291edde091055eebad6ef0
parent27ffd37c15593d4581b8462de435a08766477a4b
parenta56ec3dfe3e1486bbf386687b8de5aa936c2498b
Merge branch 'master' into blender2.8