diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp index 4c473510e..a097568a5 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/code/Common/DefaultLogger.cpp b/code/Common/DefaultLogger.cpp index 8c946e8fd..76a5cbab7 100644 --- a/code/Common/DefaultLogger.cpp +++ b/code/Common/DefaultLogger.cpp @@ -260,7 +260,7 @@ void DefaultLogger::kill() { // ---------------------------------------------------------------------------------- // Debug message void DefaultLogger::OnDebug(const char *message) { - if (m_Severity < Logger::DEBUG) { + if (m_Severity < Logger::DEBUGGING) { return; } diff --git a/include/assimp/Logger.hpp b/include/assimp/Logger.hpp index 1e5a61eee..2ea4dacb7 100644 --- a/include/assimp/Logger.hpp +++ b/include/assimp/Logger.hpp @@ -73,9 +73,9 @@ public: * @brief Log severity to describe the granularity of logging. */ enum LogSeverity { - NORMAL, //!< Normal granularity of logging - DEBUG, //!< Debug messages will be logged, but not verbose debug messages. - VERBOSE //!< All messages will be logged + NORMAL, ///< Normal granularity of logging + DEBUGGING, ///< Debug messages will be logged, but not verbose debug messages. + VERBOSE ///< All messages will be logged }; // ---------------------------------------------------------------------- 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