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

Updating PR to change lower API to return AZStd::string instead of const char* for safety.

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2021-08-25 15:28:42 -05:00
parent d64c034fee
commit d211771253
57 changed files with 142 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/Animation/AnimNode.cpp
+2 -2
View File
@@ -65,7 +65,7 @@ int CUiAnimNode::GetTrackCount() const
return static_cast<int>(m_tracks.size());
}
const char* CUiAnimNode::GetParamName(const CUiAnimParamType& paramType) const
AZStd::string CUiAnimNode::GetParamName(const CUiAnimParamType& paramType) const
{
SParamInfo info;
if (GetParamInfoFromType(paramType, info))
@@ -636,7 +636,7 @@ void CUiAnimNode::Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyT
EUiAnimNodeType nodeType = GetType();
static_cast<UiAnimationSystem*>(GetUiAnimationSystem())->SerializeNodeType(nodeType, xmlNode, bLoading, IUiAnimSequence::kSequenceVersion, m_flags);
xmlNode->setAttr("Name", GetName());
xmlNode->setAttr("Name", GetName().c_str());
// Don't store expanded or selected flags
int flags = GetFlags() & ~(eUiAnimNodeFlags_Expanded | eUiAnimNodeFlags_EntitySelected);