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

Merge branch 'master' into new-file-detection

Browse Source
This commit is contained in:
Krishty
2021-05-05 00:09:42 +02:00
parent 0f3e6e2941 be85eac703
commit b79b84d34e
62 changed files with 1507 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/Common/BaseImporter.cpp
View File

@@ -97,7 +97,7 @@ void BaseImporter::UpdateImporterScale(Importer *pImp) {
// Set active scaling
pImp->SetPropertyFloat(AI_CONFIG_APP_SCALE_KEY, static_cast<float>(activeScale));
ASSIMP_LOG_DEBUG_F("UpdateImporterScale scale set: %f", activeScale);
ASSIMP_LOG_DEBUG_F("UpdateImporterScale scale set: ", activeScale);
}
// ------------------------------------------------------------------------------------------------
@@ -245,7 +245,7 @@ std::string BaseImporter::GetExtension(const std::string &file) {
// no file extension at all
if (pos == std::string::npos) {
return "";
return std::string();
}
// thanks to Andy Maloney for the hint