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

rereworked suggested by clang

pull/2005/head
CwTCwT 2018-06-09 21:12:05 +02:00
parent 19fade2164
commit 9d2a1ca047
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/BlenderCustomData.cpp
View File

@ -91,11 +91,6 @@ namespace Assimp {
{} {}
}; };
/**
* @brief shortcut for array of CustomDataTypeDescription
*/
typedef std::array<CustomDataTypeDescription, CD_NUMTYPES> CustomDataTypeDescriptions;
/** /**
* @brief helper macro to define Structure type specific CustomDataTypeDescription * @brief helper macro to define Structure type specific CustomDataTypeDescription
* @note IMPL_STRUCT_READ for same ty must be used earlier to implement the typespecific read function * @note IMPL_STRUCT_READ for same ty must be used earlier to implement the typespecific read function
@ -115,7 +110,7 @@ namespace Assimp {
* other (like CD_ORCO, ...) uses arrays of rawtypes or even arrays of Structures * other (like CD_ORCO, ...) uses arrays of rawtypes or even arrays of Structures
* use a special readfunction for that cases * use a special readfunction for that cases
*/ */
CustomDataTypeDescriptions customDataTypeDescriptions = { std::array<CustomDataTypeDescription, CD_NUMTYPES> customDataTypeDescriptions = { {
DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MVert), DECL_STRUCT_CUSTOMDATATYPEDESCRIPTION(MVert),
DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION, DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION, DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
@ -162,7 +157,7 @@ namespace Assimp {
DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION, DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION,
DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION DECL_UNSUPPORTED_CUSTOMDATATYPEDESCRIPTION
}; }};
bool isValidCustomDataType(const int cdtype) { bool isValidCustomDataType(const int cdtype) {