Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 25 Apr 2018 08:39:51 +0000 (10:39 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 25 Apr 2018 08:39:51 +0000 (10:39 +0200)
commite649feea1432ac5c3ca97ea813f9e2d5b4942d64
treeb7fe7cc2bc8b995884afc6680424f8e68bddb73b
parent5f8b85e253ff81b73ca1547c69858c1ed419029b
parentf1bc0aeddedacf68182164dde5d4674d11aba6c9
Merge branch 'master' into blender2.8