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)
commitf692886164630f9599183151481712a40de8fa45
treee6a43be9631ea531baac609cff9c6b82ca7d1e31
parent9b228e465f1381782d52eb9f015c9c3eb2e528f5
parentda4991fcaebc12b2b5b61eaa15189617eeb792fd
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/collada/DocumentImporter.h