AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed null animations not being cleared out correctly when loading animsets

This commit is contained in:
parax0 2016-04-27 20:40:43 -06:00
parent 50dcc9cc1a
commit 0bd9506a93
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Resource/Factory/CAnimSetLoader.cpp
View File

@ -328,23 +328,19 @@ CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& rANCS)
Loader.LoadHalfTransition(rANCS); Loader.LoadHalfTransition(rANCS);
} }
// Remove empty anims
for (auto it = Loader.mAnimPrimitives.begin(); it != Loader.mAnimPrimitives.end(); it++)
{
if (!it->Loaded)
it = Loader.mAnimPrimitives.erase(it);
}
// Add anims to set // Add anims to set
for (u32 iPrim = 0; iPrim < Loader.mAnimPrimitives.size(); iPrim++) for (u32 iPrim = 0; iPrim < Loader.mAnimPrimitives.size(); iPrim++)
{ {
SPrimitive& rPrim = Loader.mAnimPrimitives[iPrim]; SPrimitive& rPrim = Loader.mAnimPrimitives[iPrim];
if (rPrim.Loaded)
{
CAnimSet::SAnimation Anim; CAnimSet::SAnimation Anim;
Anim.Name = rPrim.Name; Anim.Name = rPrim.Name;
Anim.pAnim = gResCache.GetResource(rPrim.AnimID, "ANIM"); Anim.pAnim = gResCache.GetResource(rPrim.AnimID, "ANIM");
Loader.pSet->mAnims.push_back(Anim); Loader.pSet->mAnims.push_back(Anim);
} }
}
return Loader.pSet; return Loader.pSet;
} }