fix CalcModelFrame/SetBone/GetBone/SetAnimation not grabbing smf from modeldata for decoupled anims
This commit is contained in:
parent
b61941b4a6
commit
4bdc3ee28d
2 changed files with 11 additions and 7 deletions
|
|
@ -384,7 +384,7 @@ CalcModelFrameInfo CalcModelFrame(FLevelLocals *Level, const FSpriteModelFrame *
|
|||
|
||||
if(is_decoupled)
|
||||
{
|
||||
smfNext = smf = &BaseSpriteModelFrames[actor->GetClass()];
|
||||
smfNext = smf = &BaseSpriteModelFrames[(data != nullptr && data->modelDef != nullptr) ? data->modelDef : actor->GetClass()];
|
||||
if(data && !(data->curAnim.flags & MODELANIM_NONE))
|
||||
{
|
||||
calcFrames(data->curAnim, tic, decoupled_frame, inter);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue