Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Thu, 24 May 2018 06:48:40 +0000 (08:48 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Thu, 24 May 2018 06:48:40 +0000 (08:48 +0200)
commit569a5e0d7c96751916fc6a845813103407a14ab9
treebcdc2738f91dab5fab649b6594bbe890f6ba8903
parent5ee965eea59b3e4895edf49cb7a07dec563395f5
parent3e9b592b08b614e29acdfd7906f572953c528378
Merge branch 'master' into blender2.8