Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 13 Sep 2018 09:27:38 +0000 (11:27 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 13 Sep 2018 09:27:38 +0000 (11:27 +0200)
commit2c4f091feb0b0eca4893bf6914f4698daf4556ed
treec1bc7caeb6bd47cb1209738b790f99a02c31d332
parentaacdd28edd838a011615af2a998aa2d90b4a75f3
parent2be1d8bbafc8a3cedd4d2699ded260215bb07da2
Merge branch 'master' into blender2.8