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

awww, merge error

pull/536/head
abma 2015-04-16 03:13:19 +02:00
parent 611778045d
commit 1c1f3c25f8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/C4DImporter.cpp
View File

@ -639,3 +639,6 @@ unsigned int C4DImporter::ResolveMaterial(PolygonObject* obj)
ai_assert((*it).second < mat_count); ai_assert((*it).second < mat_count);
return (*it).second; return (*it).second;
} }
#endif // ASSIMP_BUILD_NO_C4D_IMPORTER