Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Mon, 11 Jun 2018 08:03:42 +0000 (10:03 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Mon, 11 Jun 2018 08:03:42 +0000 (10:03 +0200)
commit0ec6196ae3ebab4f8cb90bc997c85d14c098aaef
tree57cf01b04bb33157555c598fcea41575c9958419
parent05e7802a97360a49d59ddc6647d7169457ff9745
parent7ac0272b776a18cbf4de2aa447cadd50909606c2
Merge branch 'master' into blender2.8