izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

- Introduces UInterface for UAnimDataController and moves implementation to new AnimationDataController (editor only) module

Browse Source 
- Export curve types entirely for use outside of Engine
- Miscellaneous small fixes from UE5 Main
#rb Thomas.Sarkanen
#preflight 6061973e25b98e00019ea154

#ROBOMERGE-OWNER: jurre.debaare
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 15849140 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15851594 by jurre debaare in ue5-main branch]
This commit is contained in:
jurre debaare
2021-03-29 11:34:31 -04:00
parent b7a9e11206
commit 349e585908
40 changed files with 498 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_Skeleton.cpp
View File

@@ -905,18 +905,18 @@ void FAssetTypeActions_Skeleton::RetargetSkeleton(TArray<FAssetToRemapSkeleton>&
{
if ( UAnimationAsset* AnimAsset = Cast<UAnimationAsset>(Asset) )
{
TUniquePtr<UAnimDataController::FScopedBracket> ScopedBracket;
TUniquePtr<IAnimationDataController::FScopedBracket> ScopedBracket;
if (UAnimSequenceBase* SequenceBase = Cast<UAnimSequenceBase>(AnimAsset))
{
UAnimDataController* Controller = SequenceBase->GetController();
ScopedBracket = MakeUnique<UAnimDataController::FScopedBracket>(Controller, LOCTEXT("FAssetTypeActions_Skeleton_Bracket", "Retargeting Skeleton"));
IAnimationDataController& Controller = SequenceBase->GetController();
ScopedBracket = MakeUnique<IAnimationDataController::FScopedBracket>(Controller, LOCTEXT("FAssetTypeActions_Skeleton_Bracket", "Retargeting Skeleton"));
Controller->FindOrAddCurveNamesOnSkeleton(NewSkeleton, ERawCurveTrackTypes::RCT_Float);
Controller.FindOrAddCurveNamesOnSkeleton(NewSkeleton, ERawCurveTrackTypes::RCT_Float);
if (UAnimSequence* Sequence = Cast<UAnimSequence>(SequenceBase))
{
Controller->FindOrAddCurveNamesOnSkeleton(NewSkeleton, ERawCurveTrackTypes::RCT_Transform);
Controller.FindOrAddCurveNamesOnSkeleton(NewSkeleton, ERawCurveTrackTypes::RCT_Transform);
}
}