Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Tue, 1 May 2018 14:28:02 +0000 (16:28 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Tue, 1 May 2018 14:28:02 +0000 (16:28 +0200)
commit43452c254e2dae31361a74ff90eb44ac35368f3f
treed32a1922353e13d5fe79e61feae3371677a020d1
parentbe88f23b834b9f9e9c7c71215284a4c1f6fe0f66
parentc5c3fa3eacb32b6e9f8ece47d1c69f274b9070c0
Merge branch 'blender2.8' of git.blender.org:blender into blender2.8