Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Aug 2018 14:13:13 +0000 (16:13 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Aug 2018 14:13:13 +0000 (16:13 +0200)
commitbe5ccb9ce886850ea6c5db337423e68e729f17c7
tree4839b6831bb10355fbb5f9025665c5ef18fc7a92
parentc48eb521642b5d94e5f0eb8fd15f7d587f407078
parent9336aef4eb279804ee5cccec63d818810233e6c5
Merge branch 'master' into blender2.8