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/UiElementComponent.cpp
+3 -3
View File
@@ -1487,7 +1487,7 @@ bool UiElementComponent::MoveEntityAndDescendantsToListAndReplaceWithEntityId(AZ
elementNode.Convert<AZ::EntityId>(context, elementFieldName.c_str());
// copy in the subNode that stores the actual u64 (that we saved a copy of above)
int newEntityIdIndex = elementNode.AddElement(u64Node);
elementNode.AddElement(u64Node);
}
else
{
@@ -1500,10 +1500,10 @@ bool UiElementComponent::MoveEntityAndDescendantsToListAndReplaceWithEntityId(AZ
AZ::SerializeContext::DataElementNode& childOrderEntryEntityIdElementNode = elementNode.GetSubElement(childOrderEntryEntityIdIndex);
// copy in the subNode that stores the actual u64 (that we saved a copy of above)
int newEntityIdIndex = childOrderEntryEntityIdElementNode.AddElement(u64Node);
childOrderEntryEntityIdElementNode.AddElement(u64Node);
AZ::u64 sortIndex = static_cast<AZ::u64>(index);
int sortIndexElementIndex = elementNode.AddElementWithData<AZ::u64>(context, "SortIndex", sortIndex);
elementNode.AddElementWithData<AZ::u64>(context, "SortIndex", sortIndex);
}
return true;