mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-14 11:06:45 +00:00
Code Issues Releases Wiki Activity

Revert move of default anim rename

Browse source
This commit is contained in:
Sam Hellawell 2024-07-14 02:38:57 +01:00
parent 03413a895f
commit 56a40577ed
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/resource/keyframemanager.cpp
View file

@ -86,6 +86,12 @@ namespace Resource
{ {
if (animation) if (animation)
{ {
//"Default" is osg dae plugin's default naming scheme for unnamed animations
if (animation->getName() == "Default")
{
animation->setName(std::string("idle"));
}
osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation; osg::ref_ptr<Resource::Animation> mergedAnimationTrack = new Resource::Animation;
const std::string animationName = animation->getName(); const std::string animationName = animation->getName();
mergedAnimationTrack->setName(animationName); mergedAnimationTrack->setName(animationName);

4
components/resource/scenemanager.cpp
View file

@ -437,10 +437,6 @@ namespace Resource
{ {
if (animation) if (animation)
{ {
// "Default" is osg dae plugin's default naming scheme for unnamed animations
if (animation->getName() == "Default")
animation->setName(std::string("idle"));
auto& channels = animation->getChannels(); auto& channels = animation->getChannels();
for (auto& channel : channels) for (auto& channel : channels)
{ {