Merge branch 'master' into ObjExporter_nomtl

This commit is contained in:
Kim Kulling
2017-11-04 09:32:50 +01:00
committed by GitHub
47 changed files with 103 additions and 83 deletions

View File

@@ -244,7 +244,7 @@ bool Exporter::IsDefaultIOHandler() const {
// ------------------------------------------------------------------------------------------------
const aiExportDataBlob* Exporter::ExportToBlob( const aiScene* pScene, const char* pFormatId,
unsigned int, const ExportProperties* pProperties ) {
unsigned int, const ExportProperties* /*pProperties*/ ) {
if (pimpl->blob) {
delete pimpl->blob;
pimpl->blob = NULL;