v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2236 from rdb/patch-1 

Fix static init ordering issue in 3mf importer
pull/2239/head
Kim Kulling 2018-11-24 13:29:34 +01:00 committed by GitHub
parent d98f8bbf7b 23af5336d5
commit 837a0742c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/D3MFImporter.cpp
View File

@ -419,8 +419,6 @@ private:
} //namespace D3MF } //namespace D3MF
static const std::string Extension = "3mf";
static const aiImporterDesc desc = { static const aiImporterDesc desc = {
"3mf Importer", "3mf Importer",
"", "",
@ -431,7 +429,7 @@ static const aiImporterDesc desc = {
0, 0,
0, 0,
0, 0,
Extension.c_str() "3mf"
}; };
D3MFImporter::D3MFImporter() D3MFImporter::D3MFImporter()
@ -445,7 +443,7 @@ D3MFImporter::~D3MFImporter() {
bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool checkSig) const { bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool checkSig) const {
const std::string extension( GetExtension( filename ) ); const std::string extension( GetExtension( filename ) );
if(extension == Extension ) { if(extension == desc.mFileExtensions ) {
return true; return true;
} else if ( !extension.length() || checkSig ) { } else if ( !extension.length() || checkSig ) {
if ( nullptr == pIOHandler ) { if ( nullptr == pIOHandler ) {