From 0363c18f1f1a433b47be74138cc81e904525189e Mon Sep 17 00:00:00 2001 From: Malcolm Tyrrell Date: Thu, 15 Oct 2020 10:07:24 +0100 Subject: [PATCH] Read weights --- code/AssetLib/FBX/FBXImporter.cpp | 1 + include/assimp/config.h.in | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp index f80b65cd4..4eb13b392 100644 --- a/code/AssetLib/FBX/FBXImporter.cpp +++ b/code/AssetLib/FBX/FBXImporter.cpp @@ -130,6 +130,7 @@ void FBXImporter::SetupProperties(const Importer *pImp) { settings.readCameras = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_CAMERAS, true); settings.readLights = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_LIGHTS, true); settings.readAnimations = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_ANIMATIONS, true); + settings.readWeights = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_READ_WEIGHTS, true); settings.strictMode = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_STRICT_MODE, false); settings.preservePivots = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_PRESERVE_PIVOTS, true); settings.optimizeEmptyAnimationCurves = pImp->GetPropertyBool(AI_CONFIG_IMPORT_FBX_OPTIMIZE_EMPTY_ANIMATION_CURVES, true); diff --git a/include/assimp/config.h.in b/include/assimp/config.h.in index c26dcc77f..d78568da7 100644 --- a/include/assimp/config.h.in +++ b/include/assimp/config.h.in @@ -615,6 +615,15 @@ enum aiComponent #define AI_CONFIG_IMPORT_FBX_READ_ANIMATIONS \ "IMPORT_FBX_READ_ANIMATIONS" +// --------------------------------------------------------------------------- +/** @brief Set whether the fbx importer will read weights. + * + * The default value is true (1) + * Property type: bool + */ +#define AI_CONFIG_IMPORT_FBX_READ_WEIGHTS \ + "IMPORT_FBX_READ_WEIGHTS" + // --------------------------------------------------------------------------- /** @brief Set whether the fbx importer will act in strict mode in which only * FBX 2013 is supported and any other sub formats are rejected. FBX 2013