Main: SubEntity - provide correct bone matrices for binding pose

when object space bones are in use
OGRECave · Feb 23, 2024 · 671ba5b · 671ba5b
1 parent f05165f
commit 671ba5b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/OgreMain/src/OgreSubEntity.cpp b/OgreMain/src/OgreSubEntity.cpp
@@ -177,27 +177,29 @@ namespace Ogre {
                 mSubMesh->parent->sharedBlendIndexToBoneIndexMap : mSubMesh->blendIndexToBoneIndexMap;
             assert(indexMap.size() <= mParentEntity->mNumBoneMatrices);
 
+            if (MeshManager::getBonesUseObjectSpace())
+            {
+                *xform++ = mParentEntity->_getParentNodeFullTransform();
+            }
+
             if (mParentEntity->_isSkeletonAnimated())
             {
                 // Bones, use cached matrices built when Entity::_updateRenderQueue was called
                 auto boneMatrices = MeshManager::getBonesUseObjectSpace() ? mParentEntity->mBoneMatrices
                                                                           : mParentEntity->mBoneWorldMatrices;
                 assert(boneMatrices);
 
-                if (MeshManager::getBonesUseObjectSpace())
-                {
-                    *xform++ = mParentEntity->_getParentNodeFullTransform();
-                }
-
                 for (auto idx : indexMap)
                 {
                     *xform++ = boneMatrices[idx];
                 }
             }
             else
             {
+                auto& value = MeshManager::getBonesUseObjectSpace() ? Affine3::IDENTITY
+                                                                    : mParentEntity->_getParentNodeFullTransform();
                 // All animations disabled, use parent entity world transform only
-                std::fill_n(xform, indexMap.size(), mParentEntity->_getParentNodeFullTransform());
+                std::fill_n(xform, indexMap.size(), value);
             }
         }
     }