mirror of
https://github.com/OpenMW/openmw.git
synced 2025-03-31 07:06:45 +00:00
Fixed ancestor ghost crash
This commit is contained in:
parent
eab69f18ac
commit
5e1cc07ee8
2 changed files with 4 additions and 4 deletions
|
@ -408,7 +408,7 @@ namespace MWRender{
|
||||||
if(time < iter->getStartTime() || time < startTime || time > iter->getStopTime())
|
if(time < iter->getStartTime() || time < startTime || time > iter->getStopTime())
|
||||||
{
|
{
|
||||||
slot++;
|
slot++;
|
||||||
iter++;
|
//iter++;
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -449,7 +449,6 @@ namespace MWRender{
|
||||||
//bone->setOrientation(r);
|
//bone->setOrientation(r);
|
||||||
}
|
}
|
||||||
skel = base->getSkeleton();
|
skel = base->getSkeleton();
|
||||||
|
|
||||||
if(skel->hasBone(iter->getBonename())){
|
if(skel->hasBone(iter->getBonename())){
|
||||||
Ogre::Bone* bone = skel->getBone(iter->getBonename());
|
Ogre::Bone* bone = skel->getBone(iter->getBonename());
|
||||||
if(bTrans)
|
if(bTrans)
|
||||||
|
@ -485,4 +484,5 @@ namespace MWRender{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -45,7 +45,7 @@ void CreatureAnimation::runAnimation(float timepassed){
|
||||||
|
|
||||||
//Handle the shapes dependent on animation transforms
|
//Handle the shapes dependent on animation transforms
|
||||||
time += timepassed;
|
time += timepassed;
|
||||||
if(time > stopTime){
|
if(time >= stopTime){
|
||||||
animate--;
|
animate--;
|
||||||
//std::cout << "Stopping the animation\n";
|
//std::cout << "Stopping the animation\n";
|
||||||
if(animate == 0)
|
if(animate == 0)
|
||||||
|
|
Loading…
Reference in a new issue