Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Wed, 2 May 2018 14:59:42 +0000 (16:59 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Wed, 2 May 2018 14:59:42 +0000 (16:59 +0200)
commit9cfbdff71c0c04d351f12d5674d54c15e3a978d9
tree403d6f187304ed2df375f2ae8922ef760c2c0e8c
parentae1ba7679c0792361209da8e098b2c47dc60ff2b
parentbefbf7eb9b7d48113bb91c1fcf3febf439286134
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8