summaryrefslogtreecommitdiffstats
path: root/code/AssetLib
diff options
context:
space:
mode:
authorNSG <[email protected]>2025-05-31 21:41:25 +0900
committerGitHub <[email protected]>2025-05-31 14:41:25 +0200
commitc4515f53ca9a60cf4645b9bc837faaf14026b6d1 (patch)
tree3d2f5b0d53c5857c3dbcdf9de4bd6fb66dcb390c /code/AssetLib
parent7eb6b0c3dbc2ee59b58c98f43e5ac438cc7f6883 (diff)
Fix: Add "preservePivots" condition when importing FBX animation (#6115)HEADupstream/master
Co-authored-by: Kim Kulling <[email protected]>
Diffstat (limited to 'code/AssetLib')
-rw-r--r--code/AssetLib/FBX/FBXConverter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/code/AssetLib/FBX/FBXConverter.cpp b/code/AssetLib/FBX/FBXConverter.cpp
index 87d0136d8..7ddc231b7 100644
--- a/code/AssetLib/FBX/FBXConverter.cpp
+++ b/code/AssetLib/FBX/FBXConverter.cpp
@@ -2958,7 +2958,7 @@ void FBXConverter::GenerateNodeAnimations(std::vector<aiNodeAnim *> &node_anims,
// be invoked _later_ (animations come first). If this node has only rotation,
// scaling and translation _and_ there are no animated other components either,
// we can use a single node and also a single node animation channel.
- if( !has_complex && !NeedsComplexTransformationChain(target)) {
+ if (!doc.Settings().preservePivots || (!has_complex && !NeedsComplexTransformationChain(target))) {
aiNodeAnim* const nd = GenerateSimpleNodeAnim(fixed_name, target, chain,
node_property_map.end(),
start, stop,