Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 07:49:44 +0000 (09:49 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 07:49:44 +0000 (09:49 +0200)
commit163b631122b94713e68c4f30ee3edfe36278376e
treee5585f3a2962988b4f2d7f95a2ed44f1546a9dca
parent16fac020e07d7ad0caa5901c0740c88e9772194f
parent95a45e308d425f69c0594af92e6e0666b3fd028a
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8