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

Simple merge