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

removing files that got added by rebase

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)

Squashed commits:

[a19269426] fixing more strings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)

Squashed commits:

[d2a049324] fixing more strings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)

Squashed commits:

[a1ff4c101] trying to build

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-23 14:52:30 -07:00
committed by Esteban Papp
parent 433aec4f34
commit 9c72510a4f
78 changed files with 330 additions and 7193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/UiTextComponent.cpp
+1 -21
View File
@@ -4995,28 +4995,8 @@ bool UiTextComponent::VersionConverter(AZ::SerializeContext& context,
AZ::SerializeContext::DataElementNode& classElement)
{
// conversion from version 1: Need to convert Color to Color and Alpha
if (classElement.GetVersion() == 1)
{
if (!LyShine::ConvertSubElementFromCryStringToAssetRef<LyShine::FontAsset>(context, classElement, "FontFileName"))
{
return false;
}
if (!LyShine::ConvertSubElementFromColorToColorPlusAlpha(context, classElement, "Color", "Alpha"))
{
return false;
}
}
// conversion from version 1 or 2: Need to convert Text from CryString to AzString
if (classElement.GetVersion() <= 2)
{
// Call internal function to work-around serialization of empty AZ std string
if (!LyShine::ConvertSubElementFromCryStringToAzString(context, classElement, "Text"))
{
return false;
}
}
AZ_Assert(classElement.GetVersion() <= 2, "Unsupported UiTextComponent version: %d", classElement.GetVersion());
// Versions prior to v4: Change default font
if (classElement.GetVersion() <= 3)