TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'alpha40/scaleShenanigans' of https://github.com/Azaezel/Torque3D-1 into Preview4_0

Browse source
This commit is contained in:
Areloch 2021-11-09 19:10:50 -06:00
commit 8d310b8d5d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/ts/assimp/assimpShapeLoader.cpp
View file

@ -177,11 +177,11 @@ void AssimpShapeLoader::enumerateScene()
// Setup default units for shape format // Setup default units for shape format
String importFormat; String importFormat;
if (getMetaString("SourceAsset_Format", importFormat))
const aiImporterDesc* importerDescription = aiGetImporterDesc(shapePath.getExtension().c_str());
if (importerDescription->mName == "Autodesk FBX Importer")
{ {
// FBX uses cm as standard unit, so convert to meters ColladaUtils::getOptions().formatScaleFactor = 0.01f;
if (importFormat.equal("Autodesk FBX Importer", String::NoCase))
ColladaUtils::getOptions().formatScaleFactor = 0.01f;
} }
// Set import options (if they are not set to override) // Set import options (if they are not set to override)