Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Mon, 14 May 2018 10:44:05 +0000 (12:44 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Mon, 14 May 2018 10:44:05 +0000 (12:44 +0200)
commit261d78a2c634f30a1b450fec722121f3f91a53e3
tree5829a27b9b4e889330f09ed5eb6b8320578e7ebe
parent51341dafc35fd2183605c68a6151b3d2d8894e34
parent0cfe9f95df9c7a8e654b589802d6677d9e0c73e9
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8