Browse Source

Don't drop TRS animation nodes

Josh Engebretson 10 years ago
parent
commit
96ba8094b6
1 changed files with 12 additions and 1 deletions
  1. 12 1
      Source/ThirdParty/Assimp/code/FBXConverter.cpp

+ 12 - 1
Source/ThirdParty/Assimp/code/FBXConverter.cpp

@@ -725,7 +725,18 @@ private:
                 const TransformationComp comp = static_cast<TransformationComp>(i);
 
                 if (chain[i].IsIdentity() && (anim_chain_bitmask & bit) == 0) {
-                    continue;
+
+                    // ATOMIC BEGIN
+                    // Only optimize these out if not a TRS
+                    // As these may be animated in an external FBX
+                    // and should not be dropped
+                    if (comp != TransformationComp_Translation &&
+                        comp != TransformationComp_Rotation &&
+                        comp != TransformationComp_Scaling)
+                    {
+                        continue;
+                    }
+                    // ATOMIC END
                 }
 
                 aiNode* nd = new aiNode();