Merge remote-tracking branch 'origin/master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Wed, 5 Dec 2018 19:30:46 +0000 (20:30 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Wed, 5 Dec 2018 19:30:46 +0000 (20:30 +0100)
1  2 
source/blender/collada/DocumentImporter.h