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)
commitd6454a15f709a3f0eea62ec96a9e8929d85a4811
tree3a0f1a5ebf7d0636d88192f2fe48379471ecfc0e
parent5584cad5d90ec56febaca96e6ea1326c15523fa4
parent3552731551ef1845b493ffebf78be5a42527e9f2
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentImporter.cpp
source/blender/collada/DocumentImporter.h