diff --git a/src/osgPlugins/fbx/fbxRMesh.cpp b/src/osgPlugins/fbx/fbxRMesh.cpp index bafee57c4..5c13812cc 100644 --- a/src/osgPlugins/fbx/fbxRMesh.cpp +++ b/src/osgPlugins/fbx/fbxRMesh.cpp @@ -436,10 +436,10 @@ osgDB::ReaderWriter::ReadResult readMesh(KFbxSdkManager& pSdkManager, //assert(KFbxCluster::eNORMALIZE == pCluster->GetLinkMode()); KFbxNode* pBone = pCluster->GetLink(); - KFbxXMatrix transformLink; - pCluster->GetTransformLinkMatrix(transformLink); - KFbxXMatrix transformLinkInverse = transformLink.Inverse(); - const double* pTransformLinkInverse = transformLinkInverse; + KFbxXMatrix transformLink; + pCluster->GetTransformLinkMatrix(transformLink); + KFbxXMatrix transformLinkInverse = transformLink.Inverse(); + const double* pTransformLinkInverse = transformLinkInverse; if (!boneBindMatrices.insert(std::pair(pBone, osg::Matrix(pTransformLinkInverse))).second) { osg::notify(osg::WARN) << "Multiple meshes attached to a bone - bind matrices may be incorrect." << std::endl; @@ -568,10 +568,10 @@ osgDB::ReaderWriter::ReadResult readMesh(KFbxSdkManager& pSdkManager, KFbxSkin* pSkin = (KFbxSkin*)fbxMesh->GetDeformer(0, KFbxDeformer::eSKIN); if (pSkin->GetClusterCount()) { - KFbxXMatrix fbxTransformMatrix; - pSkin->GetCluster(0)->GetTransformMatrix(fbxTransformMatrix); - const double* pTransformMatrix = fbxTransformMatrix; - osgGeometricTransform.postMult(osg::Matrix(pTransformMatrix)); + KFbxXMatrix fbxTransformMatrix; + pSkin->GetCluster(0)->GetTransformMatrix(fbxTransformMatrix); + const double* pTransformMatrix = fbxTransformMatrix; + osgGeometricTransform.postMult(osg::Matrix(pTransformMatrix)); } } diff --git a/src/osgPlugins/fbx/fbxRNode.cpp b/src/osgPlugins/fbx/fbxRNode.cpp index cc7024f4a..a5a9bcd4b 100644 --- a/src/osgPlugins/fbx/fbxRNode.cpp +++ b/src/osgPlugins/fbx/fbxRNode.cpp @@ -104,8 +104,8 @@ void makeLocalMatrix(const KFbxNode* pNode, osg::Matrix& m) ScalingPivotInverse: inverse of ScalingPivot */ - // When this flag is set to false, the RotationOrder, the Pre/Post rotation - // values and the rotation limits should be ignored. + // When this flag is set to false, the RotationOrder, the Pre/Post rotation + // values and the rotation limits should be ignored. bool rotationActive = pNode->RotationActive.Get(); ERotationOrder fbxRotOrder = rotationActive ? pNode->RotationOrder.Get() : eEULER_XYZ; @@ -237,8 +237,8 @@ void readUpdateMatrixTransform(osgAnimation::UpdateMatrixTransform* pUpdate, KFb fbxRotPiv[1] + fbxRotOffset[1], fbxRotPiv[2] + fbxRotOffset[2])); - // When this flag is set to false, the RotationOrder, the Pre/Post rotation - // values and the rotation limits should be ignored. + // When this flag is set to false, the RotationOrder, the Pre/Post rotation + // values and the rotation limits should be ignored. bool rotationActive = pNode->RotationActive.Get(); ERotationOrder fbxRotOrder = (rotationActive && pNode->RotationOrder.IsValid()) ?