Merge UE5/RET @ 16305968 to UE5/Main

This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
This commit is contained in:
aurel cordonnier
2021-05-12 18:10:03 -04:00
parent d9c3d7b426
commit 8eebe8841f
2886 changed files with 96788 additions and 435024 deletions

View File

@@ -25,9 +25,9 @@ struct FPreAnimatedGeometryCacheTokenProducer : IMovieScenePreAnimatedTokenProdu
bInManualTick = InComponent->GetManualTick();
}
virtual void RestoreState(UObject& ObjectToRestore, IMovieScenePlayer& Player)
virtual void RestoreState(UObject& Object, const UE::MovieScene::FRestoreStateParams& Params)
{
UGeometryCacheComponent* Component = CastChecked<UGeometryCacheComponent>(&ObjectToRestore);
UGeometryCacheComponent* Component = CastChecked<UGeometryCacheComponent>(&Object);
Component->SetManualTick(bInManualTick);
Component->ResetAnimationTime();
}