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

Merge branch 'master' of https://github.com/assimp/assimp

pull/1066/head
Kim Kulling 2016-11-10 21:40:05 +01:00
parent c5d6ac2c30 1126f8dade
commit 7a578aae46
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -321,7 +321,6 @@ ELSE (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER ) ADD_DEFINITIONS( -DASSIMP_BUILD_NO_C4D_IMPORTER )
ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) ENDIF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER)
ADD_SUBDIRECTORY( code/ ) ADD_SUBDIRECTORY( code/ )
IF ( ASSIMP_BUILD_ASSIMP_TOOLS ) IF ( ASSIMP_BUILD_ASSIMP_TOOLS )
IF ( WIN32 ) IF ( WIN32 )

2
include/assimp/cimport.h
View File

@ -337,7 +337,7 @@ ASSIMP_API void aiReleaseImport(
* import process. NULL if there was no error. There can't be an error if you * import process. NULL if there was no error. There can't be an error if you
* got a non-NULL #aiScene from #aiImportFile/#aiImportFileEx/#aiApplyPostProcessing. * got a non-NULL #aiScene from #aiImportFile/#aiImportFileEx/#aiApplyPostProcessing.
*/ */
ASSIMP_API const char* aiGetErrorString(); ASSIMP_API const char* aiGetErrorString(void);
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
/** Returns whether a given file extension is supported by ASSIMP /** Returns whether a given file extension is supported by ASSIMP