From 847e0291a03a15be41f5f2329555777b5fe64bcc Mon Sep 17 00:00:00 2001
From: Jeremy Abel <jeremyabel@gmail.com>
Date: Sat, 12 Aug 2017 00:13:24 -0400
Subject: [PATCH 1/2] changed a few leftover asserts to ai_assert

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

diff --git a/code/C4DImporter.cpp b/code/C4DImporter.cpp
index 252766ca6..39514f6b8 100644
--- a/code/C4DImporter.cpp
+++ b/code/C4DImporter.cpp
@@ -393,7 +393,7 @@ void C4DImporter::RecurseHierarchy(BaseObject* object, aiNode* parent)
 // ------------------------------------------------------------------------------------------------
 aiMesh* C4DImporter::ReadMesh(BaseObject* object)
 {
-    assert(object != NULL && object->GetType() == Opolygon);
+    ai_assert(object != NULL && object->GetType() == Opolygon);
 
     // based on Melange sample code
     PolygonObject* const polyObject = dynamic_cast<PolygonObject*>(object);
@@ -635,7 +635,7 @@ unsigned int C4DImporter::ResolveMaterial(PolygonObject* obj)
     TextureTag& ttag = dynamic_cast<TextureTag&>(*tag);
 
     BaseMaterial* const mat = ttag.GetMaterial();
-    assert(mat != NULL);
+    ai_assert(mat != NULL);
 
     const MaterialMap::const_iterator it = material_mapping.find(mat);
     if(it == material_mapping.end()) {

From b1313b04b8274106a3affd42db7c72d0bce8e5ff Mon Sep 17 00:00:00 2001
From: Jeremy Abel <jeremyabel@gmail.com>
Date: Sat, 12 Aug 2017 00:16:00 -0400
Subject: [PATCH 2/2] should be map, not set

---
 code/C4DImporter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/C4DImporter.h b/code/C4DImporter.h
index 3ba2a17c6..4dea82161 100644
--- a/code/C4DImporter.h
+++ b/code/C4DImporter.h
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "LogAux.h"
 
-#include <set>
+#include <map>
 struct aiNode;
 struct aiMesh;
 struct aiMaterial;