diff options
Diffstat (limited to 'src/3rdparty/assimp/include/assimp/color4.h')
-rw-r--r-- | src/3rdparty/assimp/include/assimp/color4.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/3rdparty/assimp/include/assimp/color4.h b/src/3rdparty/assimp/include/assimp/color4.h index 6bcab45df..48e7aad30 100644 --- a/src/3rdparty/assimp/include/assimp/color4.h +++ b/src/3rdparty/assimp/include/assimp/color4.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. @@ -41,10 +42,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** @file color4.h * @brief RGBA color structure, including operators when compiling in C++ */ +#pragma once #ifndef AI_COLOR4D_H_INC #define AI_COLOR4D_H_INC -#include "./Compiler/pushpack1.h" +#include "defs.h" #ifdef __cplusplus @@ -87,18 +89,16 @@ public: // Red, green, blue and alpha color values TReal r, g, b, a; -} PACK_STRUCT; // !struct aiColor4D +}; // !struct aiColor4D -typedef aiColor4t<float> aiColor4D; +typedef aiColor4t<ai_real> aiColor4D; #else struct aiColor4D { - float r, g, b, a; -} PACK_STRUCT; + ai_real r, g, b, a; +}; #endif // __cplusplus -#include "./Compiler/poppack1.h" - #endif // AI_COLOR4D_H_INC |