diff options
Diffstat (limited to 'src/3rdparty/assimp/include/assimp/cimport.h')
| -rw-r--r-- | src/3rdparty/assimp/include/assimp/cimport.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/include/assimp/cimport.h b/src/3rdparty/assimp/include/assimp/cimport.h index de0cbae30..8aa125c67 100644 --- a/src/3rdparty/assimp/include/assimp/cimport.h +++ b/src/3rdparty/assimp/include/assimp/cimport.h @@ -3,7 +3,8 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. @@ -42,9 +43,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file cimport.h * @brief Defines the C-API to the Open Asset Import Library. */ +#pragma once #ifndef AI_ASSIMP_H_INC #define AI_ASSIMP_H_INC -#include "types.h" + +#include <assimp/types.h> #include "importerdesc.h" #ifdef __cplusplus @@ -334,7 +337,7 @@ ASSIMP_API void aiReleaseImport( * 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. */ -ASSIMP_API const char* aiGetErrorString(); +ASSIMP_API const char* aiGetErrorString(void); // -------------------------------------------------------------------------------- /** Returns whether a given file extension is supported by ASSIMP @@ -414,7 +417,7 @@ ASSIMP_API void aiSetImportPropertyInteger( ASSIMP_API void aiSetImportPropertyFloat( C_STRUCT aiPropertyStore* store, const char* szName, - float value); + ai_real value); // -------------------------------------------------------------------------------- /** Set a string property. |