Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 31 Jan 2018 16:17:43 +0000 (17:17 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 31 Jan 2018 16:17:43 +0000 (17:17 +0100)
commit4b5ac3b7688d9ecd74e3ac22f3ec6749f989f8af
tree3ffaa82b0e256ba6d827f950d2f00a4491af6897
parent6a6f7547e3bf1920a010aaab7ebced83245db34e
parent9d39980cfd21119f85885b00ccdbd24cb28e33ca
Merge branch 'master' into blender2.8