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)
commit9ed7093aa639f31e9ba5b146d2d88bae942ab424
tree3ec4d0be0cabd2a43c8d4b33fd98f8eb190382a1
parentdc08df659eaadd6c59c89f268aad9cd103e1e7e5
parent64fbd50e4cc23dfb6f8ab5014e1e924136522079
Merge branch 'master' into blender2.8
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