birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
-15
View File
@@ -463,19 +463,6 @@ void CUiAnimAzEntityNode::Animate(SUiAnimContext& ec)
return;
}
int entityUpdateFlags = 0;
bool bScaleModified = false;
bool bApplyNoise = false;
bool bScriptPropertyModified = false;
bool bForceEntityActivation = false;
IUiAnimTrack* pPosTrack = NULL;
IUiAnimTrack* pRotTrack = NULL;
IUiAnimTrack* sclTrack = NULL;
int nAnimCharacterLayer = 0, iAnimationTrack = 0;
size_t nNumAudioTracks = 0;
int trackCount = NumTracks();
for (int paramIndex = 0; paramIndex < trackCount; paramIndex++)
{
@@ -1018,8 +1005,6 @@ IUiAnimTrack* CUiAnimAzEntityNode::CreateVectorTrack(const UiAnimParamData& para
track->SetParamData(param);
int numSubTracks = track->GetSubTrackCount();
track->SetSubTrackName(0, "X");
track->SetSubTrackName(1, "Y");
if (numElements > 2)