awww, merge error

2015-04-16 03:13:19 +02:00 · 2015-04-16 03:13:19 +02:00 · 1c1f3c25f8
parent 611778045d
commit 1c1f3c25f8
1 changed files with 3 additions and 0 deletions
--- 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
+