Merge branch 'master' into fix/3365

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);

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;
     }
 

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
     };
 
     // ----------------------------------------------------------------------

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