merge from master (needed to fix collada headerfiles which have been modified in...
authorGaia Clary <gaia.clary@machinimatrix.org>
Wed, 28 Feb 2018 16:29:56 +0000 (17:29 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Wed, 28 Feb 2018 16:29:56 +0000 (17:29 +0100)
commit4a892adac5937fdaa19d0309e5195a83bdb14e72
treec99b8fbccb904a59983e82ee3ede24d967dece03
parente73fe77ac09fdad139447b3a00370203049676fc
parenta363324f7fbba599522d93c4b20d7ada209967d9
merge from master (needed to fix collada headerfiles which have been modified in master and in blender2.8 slightly different)
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/ExportSettings.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/io/io_collada.c