OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix crash if Animation is not explicitly assigned in MODELDEF.

Browse source
This commit is contained in:
Mari the Deer 2022-11-24 17:49:30 +01:00 • committed by Christoph Oelckers
commit b002d5b8ec
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/common/models/models_iqm.cpp
View file

@ -514,9 +514,9 @@ const TArray<TRS>* IQMModel::AttachAnimationData()
return &TRSData;
}
const TArray<VSMatrix> IQMModel::CalculateBones(int frame1, int frame2, double inter, const TArray<TRS>& animationData, DBoneComponents* boneComponentData, int index)
const TArray<VSMatrix> IQMModel::CalculateBones(int frame1, int frame2, double inter, const TArray<TRS>* animationData, DBoneComponents* boneComponentData, int index)
{
const TArray<TRS>& animationFrames = &animationData ? animationData : TRSData;
const TArray<TRS>& animationFrames = animationData ? *animationData : TRSData;
if (Joints.Size() > 0)
{
int numbones = Joints.Size();
@ -604,4 +604,4 @@ const TArray<VSMatrix> IQMModel::CalculateBones(int frame1, int frame2, double i
return bones;
}
return {};
}
}