diff --git a/src/imports/quick3d/doc/src/qtquick3d-tool-balsam.qdoc b/src/imports/quick3d/doc/src/qtquick3d-tool-balsam.qdoc index 74f130c83840e52f09fdceb68fe491294c9866c3..4d2002758c7d4e1af7c2c4d7eaa3ab4fcc00b26a 100644 --- a/src/imports/quick3d/doc/src/qtquick3d-tool-balsam.qdoc +++ b/src/imports/quick3d/doc/src/qtquick3d-tool-balsam.qdoc @@ -167,6 +167,8 @@ meshes. from meshes. \row \li \c {--removeComponentTextures} \li Removes any embedded texture components from meshes. +\row \li \c {--fbxPreservePivots} \li Preserves extra pivot nodes created by +FBX assets (can create deep node hierarchies) \endtable The following table lists the command-line options recognized by \c balsam when diff --git a/src/plugins/assetimporters/assimp/assimpimporter.cpp b/src/plugins/assetimporters/assimp/assimpimporter.cpp index c8b50b3203d72e8aa23c9127d6cc3e67ea7aad84..c9787035c67b2d8b45f7f87a06a5d31ce88b95cf 100644 --- a/src/plugins/assetimporters/assimp/assimpimporter.cpp +++ b/src/plugins/assetimporters/assimp/assimpimporter.cpp @@ -1568,6 +1568,9 @@ void AssimpImporter::processOptions(const QVariantMap &options) m_postProcessSteps = aiPostProcessSteps(m_postProcessSteps | aiProcess_RemoveComponent); m_importer->SetPropertyInteger(AI_CONFIG_PP_RVC_FLAGS, removeComponents); } + + bool preservePivots = checkBooleanOption(QStringLiteral("fbxPreservePivots"), optionsObject); + m_importer->SetPropertyBool(AI_CONFIG_IMPORT_FBX_PRESERVE_PIVOTS, preservePivots); } bool AssimpImporter::checkBooleanOption(const QString &optionName, const QJsonObject &options) diff --git a/src/plugins/assetimporters/assimp/options.json b/src/plugins/assetimporters/assimp/options.json index fc108a4520bc48b76122ffea05e55a05b188d0b8..02f24f446300e717d87db18591af9682bad5c327 100644 --- a/src/plugins/assetimporters/assimp/options.json +++ b/src/plugins/assetimporters/assimp/options.json @@ -162,6 +162,12 @@ "description": "Removes any embedded texture components from meshes.", "value": false, "type": "Boolean" + }, + "fbxPreservePivots": { + "name": "FBX: Preserve Pivot Points", + "description": "Set whether the fbx importer will preserve pivot points (as extra nodes)", + "value": false, + "type": "Boolean" } }, "groups": {