Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Sat, 17 Mar 2018 13:24:06 +0000 (14:24 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Sat, 17 Mar 2018 13:24:06 +0000 (14:24 +0100)
1  2 
source/blender/collada/AnimationExporter.cpp
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ControllerExporter.cpp
source/blender/collada/collada_internal.cpp
source/blender/collada/collada_internal.h