Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 Nov 2017 16:09:29 +0000 (17:09 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 Nov 2017 16:09:29 +0000 (17:09 +0100)
commit2f9df08aa8eaad1127f1b44aed518e1beaf91df7
tree44fa5a31bd85914708f471a5de3cf8985caebc1e
parente314aa1e47bde878f3a36828827a354f161c8a1f
parente704d8a616376d3e0a0796396133dfe5c4df6cd5
Merge branch 'master' into blender2.8