diff --git a/Nuake/dependencies/assimp_p5.lua b/Nuake/dependencies/assimp_p5.lua index 0d1a386e..c87cc532 100644 --- a/Nuake/dependencies/assimp_p5.lua +++ b/Nuake/dependencies/assimp_p5.lua @@ -96,7 +96,8 @@ project 'assimp' 'ASSIMP_BUILD_NO_TERRAGEN_IMPORTER', 'ASSIMP_BUILD_NO_X_IMPORTER', 'ASSIMP_BUILD_NO_X3D_IMPORTER', - 'ASSIMP_BUILD_NO_XGL_IMPORTER' + 'ASSIMP_BUILD_NO_XGL_IMPORTER', + 'ASSIMP_BUILD_NO_IQM_IMPORTER' } -- Exporters defines { diff --git a/Nuake/dependencies/build/assimp/config.h b/Nuake/dependencies/build/assimp/config.h index c7ba9c08..63e664ae 100644 --- a/Nuake/dependencies/build/assimp/config.h +++ b/Nuake/dependencies/build/assimp/config.h @@ -547,6 +547,15 @@ enum aiComponent // Various stuff to fine-tune the behaviour of specific importer plugins. // ########################################################################### +// --------------------------------------------------------------------------- +/** @brief Importers which parse JSON may use this to obtain a pointer to a + * rapidjson::IRemoteSchemaDocumentProvider. + * + * The default value is nullptr + * Property type: void* + */ +#define AI_CONFIG_IMPORT_SCHEMA_DOCUMENT_PROVIDER \ + "IMPORT_SCHEMA_DOCUMENT_PROVIDER" // --------------------------------------------------------------------------- /** @brief Set whether the fbx importer will merge all geometry layers present @@ -682,6 +691,15 @@ enum aiComponent #define AI_CONFIG_FBX_CONVERT_TO_M \ "AI_CONFIG_FBX_CONVERT_TO_M" + // --------------------------------------------------------------------------- + /** @brief Will enable the skeleton struct to store bone data. + * + * This will decouple the bone coupling to the mesh. This feature is + * experimental. + */ +#define AI_CONFIG_FBX_USE_SKELETON_BONE_CONTAINER \ + "AI_CONFIG_FBX_USE_SKELETON_BONE_CONTAINER" + // --------------------------------------------------------------------------- /** @brief Set the vertex animation keyframe to be imported *