Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 12:49:34 +0000 (14:49 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 12:49:34 +0000 (14:49 +0200)
commit8a2f0058aeab48e837561719a5dda27985d99ee5
treec6ab7e5d849bd08ac44f76e4ac050d6d3002efed
parenta305652d87b7d14562e8e22aefe9073f34d2f06e
parent723c33aba075a6722a73bafe44076982981420ee
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8