mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fixcolladaregression' into 'master'

Browse source 
Fix regression with Collada-animated creatures

See merge request OpenMW/openmw!2882
This commit is contained in:
psi29a 2023-05-23 08:30:02 +00:00
commit 87b15c22f3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwrender/objects.cpp
View file

@ -4,6 +4,7 @@
#include <osg/UserDataContainer> #include <osg/UserDataContainer>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/misc/strings/algorithm.hpp>
#include <components/sceneutil/positionattitudetransform.hpp> #include <components/sceneutil/positionattitudetransform.hpp>
#include <components/sceneutil/unrefqueue.hpp> #include <components/sceneutil/unrefqueue.hpp>
@ -78,7 +79,7 @@ namespace MWRender
if (animated && !mesh.empty()) if (animated && !mesh.empty())
{ {
animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS()); animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
if (animationMesh == mesh) if (animationMesh == mesh && Misc::StringUtils::ciEndsWith(animationMesh, ".nif"))
animated = false; animated = false;
} }
@ -95,7 +96,7 @@ namespace MWRender
bool animated = true; bool animated = true;
std::string animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS()); std::string animationMesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mResourceSystem->getVFS());
if (animationMesh == mesh) if (animationMesh == mesh && Misc::StringUtils::ciEndsWith(animationMesh, ".nif"))
animated = false; animated = false;
// CreatureAnimation // CreatureAnimation