Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/3365

Browse Source
This commit is contained in:
Kim Kulling
2020-10-29 13:40:00 +01:00
committed by GitHub
parent 3fd95aff4e bff65f3827
commit 206f28b8ad
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/AssetLib/FBX/FBXImporter.cpp
View File

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

2
code/Common/DefaultLogger.cpp
View File

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