From 1c1f3c25f8b454557222163fa903cdc1252c4ae0 Mon Sep 17 00:00:00 2001
From: abma <spring@abma.de>
Date: Thu, 16 Apr 2015 03:13:19 +0200
Subject: [PATCH] awww, merge error

---
 code/C4DImporter.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/C4DImporter.cpp b/code/C4DImporter.cpp
index 1c8f783fa..07ac29f70 100644
--- a/code/C4DImporter.cpp
+++ b/code/C4DImporter.cpp
@@ -639,3 +639,6 @@ unsigned int C4DImporter::ResolveMaterial(PolygonObject* obj)
 	ai_assert((*it).second < mat_count);
 	return (*it).second;
 }
+
+#endif // ASSIMP_BUILD_NO_C4D_IMPORTER
+