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

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-26 08:23:02 -07:00
parent e5e271f45a 040b75c02c
commit 906ace3d03
66 changed files with 331 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
+2 -2
View File
@@ -363,7 +363,7 @@ void CUiAnimAzEntityNode::ComputeOffsetsFromElementNames()
}
//////////////////////////////////////////////////////////////////////////
const char* CUiAnimAzEntityNode::GetParamName(const CUiAnimParamType& param) const
AZStd::string CUiAnimAzEntityNode::GetParamName(const CUiAnimParamType& param) const
{
SParamInfo info;
if (GetParamInfoFromType(param, info))
@@ -381,7 +381,7 @@ const char* CUiAnimAzEntityNode::GetParamName(const CUiAnimParamType& param) con
}
//////////////////////////////////////////////////////////////////////////
const char* CUiAnimAzEntityNode::GetParamNameForTrack(const CUiAnimParamType& param, const IUiAnimTrack* track) const
AZStd::string CUiAnimAzEntityNode::GetParamNameForTrack(const CUiAnimParamType& param, const IUiAnimTrack* track) const
{
// for Az Component Fields we use the name from the ClassElement
if (param == eUiAnimParamType_AzComponentField)