Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 24 Nov 2017 09:58:28 +0000 (10:58 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 24 Nov 2017 09:58:28 +0000 (10:58 +0100)
commit6b4a2433778fa0b0ec881ade508f989c6c2aa226
tree7224aeb59cc7c8d0442b8db40ac9b6d4c8a1e184
parent543945b9e5edcb1005ebee3b35f6fab17721cece
parent8db63c6a1c0821e5adf9317f9d5c05f454ad85a9
Merge branch 'master' into blender2.8