Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 20 Apr 2018 09:01:29 +0000 (11:01 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 20 Apr 2018 09:01:29 +0000 (11:01 +0200)
commitbf63fee23efad5f321ad16e9e90290e8879cb614
tree99cbf227238d912c0dc15666a3757a72b5fb15e7
parent3c524178bcbbcf3fd9b98f24409481ed061a38aa
parentac8f6413ccce2efe08f6a9a1a3de3c05c8d0d1d4
Merge branch 'master' into blender2.8