From e595410de1c9a841e6a9e1570831d986d63a0aa7 Mon Sep 17 00:00:00 2001
From: rdb <rdb@users.noreply.github.com>
Date: Fri, 23 Nov 2018 20:04:16 +0100
Subject: [PATCH 1/2] Fix static init ordering issue in 3mf importer

---
 code/D3MFImporter.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

From 23af5336d55d358f7338f284e4a7e0fb4cd7aa22 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Fri, 23 Nov 2018 20:21:58 +0100
Subject: [PATCH 2/2] Update D3MFImporter.cpp

Avoid using extension twice.
---
 code/D3MFImporter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/D3MFImporter.cpp b/code/D3MFImporter.cpp
index c434d8000..de5708149 100644
--- a/code/D3MFImporter.cpp
+++ b/code/D3MFImporter.cpp
@@ -443,7 +443,7 @@ D3MFImporter::~D3MFImporter() {
 
 bool D3MFImporter::CanRead(const std::string &filename, IOSystem *pIOHandler, bool checkSig) const {
     const std::string extension( GetExtension( filename ) );
-    if(extension == "3mf" ) {
+    if(extension == desc.mFileExtensions ) {
         return true;
     } else if ( !extension.length() || checkSig ) {
         if ( nullptr == pIOHandler ) {