Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 08:42:03 +0000 (10:42 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 08:42:03 +0000 (10:42 +0200)
commita8db1efbcf1513f7bb912c98ea9c1b7d3b333727
tree08328a560a5ebb878882953e1e704c7141d7546d
parent3a4a5ed378d304d3b2ba272201df06eef7c945f9
parent1802c6e4a14256f441b46c50bd582f91591078ee
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8