Skip to content

Commit 696d4cf

Browse files
msodaautomsodaauto
committed
Merge branch 'dev' into 'master'
Update to support 5.7 See merge request soda-sim/soda-sim!21
2 parents 2bd38f6 + 048b525 commit 696d4cf

164 files changed

Lines changed: 2390 additions & 39882 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Content/Widgets/SpeedGaugeWidget.uasset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a8663717f141c318e5eb213f856f7105d8799821a5ff343e75eb8667482c85bc
3-
size 629118
2+
oid sha256:8fef56f5ae86da6990c48b49602427c4e8f2593f0a3355eaa8d26047a207d486
3+
size 617854

‎Source/RuntimeEditor/Private/MetadataPrimaryAsset.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ bool UMetadataPrimaryAsset::AddStructToMetadataGlobalScope(const UStruct* Struct
1717
check(Struct);
1818
UPackage* Package = Struct->GetOutermost();
1919
check(Package);
20-
UMetaData* MetaData = Package->GetMetaData();
21-
check(MetaData);
20+
FMetaData& MetaData = Package->GetMetaData();
2221

2322
// Check store object
2423
bool StoreObject = Struct->HasMetaData(TEXT("RuntimeMetaData"));
@@ -48,7 +47,7 @@ bool UMetadataPrimaryAsset::AddStructToMetadataGlobalScope(const UStruct* Struct
4847
for (TFieldIterator<UField> FieldIt(Struct); FieldIt; ++FieldIt)
4948
{
5049
UField* Field = *FieldIt;
51-
if (TMap<FName, FString>* FieldValues = MetaData->ObjectMetaDataMap.Find(Field))
50+
if (TMap<FName, FString>* FieldValues = MetaData.ObjectMetaDataMap.Find(Field))
5251
{
5352
for (const auto& MetaDataIt : *FieldValues)
5453
{
@@ -87,7 +86,7 @@ bool UMetadataPrimaryAsset::AddStructToMetadataGlobalScope(const UStruct* Struct
8786
for (TFieldIterator<UField> FieldIt(Struct); FieldIt; ++FieldIt)
8887
{
8988
UField* Field = *FieldIt;
90-
if (TMap<FName, FString>* FieldValues = MetaData->ObjectMetaDataMap.Find(Field))
89+
if (TMap<FName, FString>* FieldValues = MetaData.ObjectMetaDataMap.Find(Field))
9190
{
9291
FRuntimeMetadataField& MetadataField = MetadataObject.Fields.FindOrAdd(Field->GetName());
9392
MetadataField.DisplayName = Field->GetDisplayNameText().ToString();

‎Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationLink.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class FDocumentationLink
246246

247247
if ( PathAndQueryString.EndsWith( TEXT("/"), ESearchCase::CaseSensitive ) )
248248
{
249-
PathAndQueryString.LeftInline(PathAndQueryString.Len() - 1, false);
249+
PathAndQueryString.LeftInline(PathAndQueryString.Len() - 1, EAllowShrinking::No);
250250
}
251251

252252
// split path and query string

‎Source/RuntimeEditor/Private/RuntimeEditorModule.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "Modules/ModuleManager.h"
77
#include "Framework/Application/SlateApplication.h"
88
#include "Engine/UserDefinedEnum.h"
9-
#include "Engine/UserDefinedStruct.h"
9+
#include "StructUtils/UserDefinedStruct.h"
1010
#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
1111
#include "RuntimePropertyEditor/SSingleProperty.h"
1212
#include "RuntimePropertyEditor/IDetailsView.h"
@@ -32,6 +32,7 @@
3232
//#include "Widgets/Colors/SColorPicker.h"
3333
#include "RuntimePropertyEditor/PropertyRowGenerator.h"
3434

35+
3536
#include "RuntimeMetaData.h"
3637

3738
#include "SodaDetailCustomizations/ActorDetails.h"
@@ -259,8 +260,9 @@ void FRuntimeEditorModule::StartupModule()
259260

260261
StructViewerModule.StartupModule();
261262

263+
262264
Documentation = soda::FDocumentation::Create();
263-
FMultiBoxSettings::ToolTipConstructor = FMultiBoxSettings::FConstructToolTip::CreateLambda([this](const TAttribute<FText>& ToolTipText, const TSharedPtr<SWidget>& OverrideContent, const TSharedPtr<const FUICommandInfo>& Action)
265+
FMultiBoxSettings::ToolTipConstructor = FMultiBoxSettings::FConstructToolTip::CreateLambda([this](const TAttribute<FText>& ToolTipText, const TSharedPtr<SWidget>& OverrideContent, const TSharedPtr<const FUICommandInfo>& Action, bool ShowActionShortcut)
264266
{
265267
if ( Action.IsValid() )
266268
{
@@ -615,7 +617,7 @@ FStructProperty* FRuntimeEditorModule::RegisterStructOnScopeProperty(TSharedRef<
615617
UScriptStruct* InnerStruct = Cast<UScriptStruct>(const_cast<UStruct*>(StructOnScope->GetStruct()));
616618
StructProperty = new FStructProperty(StructOnScopePropertyOwner, *MakeUniqueObjectName(StructOnScopePropertyOwner, UField::StaticClass(), InnerStruct->GetFName()).ToString(), RF_Transient);
617619
StructProperty->Struct = InnerStruct;
618-
StructProperty->ElementSize = StructOnScope->GetStruct()->GetStructureSize();
620+
StructProperty->SetElementSize(StructOnScope->GetStruct()->GetStructureSize());
619621
StructOnScopePropertyOwner->AddCppProperty(StructProperty);
620622

621623
RegisteredStructToProxyMap.Add(StructName, StructProperty);

‎Source/RuntimeEditor/Private/RuntimeEditorUtils.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ FText GetCategoryText(const FField* InField)
111111
if (!NativeCategory.IsEmpty())
112112
{
113113
FText LocalizedCategory;
114-
if (!FText::FindText(CategoryLocalizationNamespace, NativeCategory, /*OUT*/LocalizedCategory, &NativeCategory))
114+
if (!FText::FindTextInLiveTable_Advanced(CategoryLocalizationNamespace, NativeCategory, /*OUT*/LocalizedCategory, &NativeCategory))
115115
{
116116
LocalizedCategory = FText::AsCultureInvariant(NativeCategory);
117117
}
@@ -134,7 +134,7 @@ FText GetCategoryText(const UField* InField)
134134
if (!NativeCategory.IsEmpty())
135135
{
136136
FText LocalizedCategory;
137-
if (!FText::FindText(CategoryLocalizationNamespace, NativeCategory, /*OUT*/LocalizedCategory, &NativeCategory))
137+
if (!FText::FindTextInLiveTable_Advanced(CategoryLocalizationNamespace, NativeCategory, /*OUT*/LocalizedCategory, &NativeCategory))
138138
{
139139
LocalizedCategory = FText::AsCultureInvariant(NativeCategory);
140140
}
@@ -242,7 +242,7 @@ FString GetFriendlyName(const FProperty* Property, UStruct* OwnerStruct/* = NULL
242242
{
243243
FString PropertyPathName = Property->GetPathName(CurrentStruct);
244244

245-
DidFindText = FText::FindText(*CurrentStruct->GetName(), *(PropertyPathName + TEXT(".FriendlyName")), /*OUT*/FoundText);
245+
DidFindText = FText::FindTextInLiveTable_Advanced(*CurrentStruct->GetName(), *(PropertyPathName + TEXT(".FriendlyName")), /*OUT*/FoundText);
246246
CurrentStruct = CurrentStruct->GetSuperStruct();
247247
} while (CurrentStruct != NULL && CurrentStruct->IsChildOf(RealOwnerStruct) && !DidFindText);
248248

‎Source/RuntimeEditor/Private/RuntimeMetaData.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ FText FRuntimeMetaData::GetDisplayNameText(const UField* Field)
379379
NativeDisplayName = FName::NameToDisplayString(FRuntimeEditorUtils::GetDisplayNameHelper(*Field), false);
380380
}
381381

382-
if (!(FText::FindText(Namespace, Key, /*OUT*/LocalizedDisplayName, &NativeDisplayName)))
382+
if (!(FText::FindTextInLiveTable_Advanced(Namespace, Key, /*OUT*/LocalizedDisplayName, &NativeDisplayName)))
383383
{
384384
LocalizedDisplayName = FText::FromString(NativeDisplayName);
385385
}
@@ -413,7 +413,7 @@ FText FRuntimeMetaData::GetToolTipText(const UField* Field, bool bShortTooltip)
413413

414414
const FString Namespace = bFoundShortTooltip ? TEXT("UObjectShortTooltips") : TEXT("UObjectToolTips");
415415
const FString Key = Field->GetFullGroupName(false);
416-
if (!FText::FindText(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
416+
if (!FText::FindTextInLiveTable_Advanced(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
417417
{
418418
if (NativeToolTip.IsEmpty())
419419
{
@@ -467,7 +467,7 @@ FText FRuntimeMetaData::GetDisplayNameText(const FField* Field)
467467
NativeDisplayName = FName::NameToDisplayString(FRuntimeEditorUtils::GetDisplayNameHelper(*Field), Field->IsA<FBoolProperty>());
468468
}
469469

470-
if (!(FText::FindText(Namespace, Key, /*OUT*/LocalizedDisplayName, &NativeDisplayName)))
470+
if (!(FText::FindTextInLiveTable_Advanced(Namespace, Key, /*OUT*/LocalizedDisplayName, &NativeDisplayName)))
471471
{
472472
LocalizedDisplayName = FText::FromString(NativeDisplayName);
473473
}
@@ -501,7 +501,7 @@ FText FRuntimeMetaData::GetToolTipText(const FField* Field, bool bShortTooltip)
501501

502502
const FString Namespace = bFoundShortTooltip ? TEXT("UObjectShortTooltips") : TEXT("UObjectToolTips");
503503
const FString Key = GetFieldFullGroupName(*Field, false);
504-
if (!FText::FindText(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
504+
if (!FText::FindTextInLiveTable_Advanced(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
505505
{
506506
if (!NativeToolTip.IsEmpty())
507507
{
@@ -713,7 +713,7 @@ FText FRuntimeMetaData::GetToolTipTextByIndex(const UEnum* Enum, int32 NameIndex
713713

714714
FString Key = Enum->GetPathName(Enum->GetOutermost()) + TEXT(".") + Enum->GetNameStringByIndex(NameIndex);
715715

716-
if (!FText::FindText(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
716+
if (!FText::FindTextInLiveTable_Advanced(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
717717
{
718718
static const FString DoxygenSee(TEXT("@see"));
719719
static const FString TooltipSee(TEXT("See:"));

‎Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryBuilderImpl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ void FDetailCategoryImpl::SetDisplayName(FName InCategoryName, const FText& Loca
666666
DisplayName = FText();
667667

668668
const FString NativeCategory = InCategoryName.ToString();
669-
if (FText::FindText(CategoryLocalizationNamespace, NativeCategory, /*OUT*/DisplayName, &NativeCategory))
669+
if (FText::FindTextInLiveTable_Advanced(CategoryLocalizationNamespace, NativeCategory, /*OUT*/DisplayName, &NativeCategory))
670670
{
671671
// Category names in English are typically gathered in their non-pretty form (eg "UserInterface" rather than "User Interface"), so skip
672672
// applying the localized variant if the text matches the raw category name, as in this case the pretty printer will do a better job

‎Source/RuntimeEditor/Private/RuntimePropertyEditor/ItemPropertyNode.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ void FItemPropertyNode::InitChildNodes()
161161
FPropertyNodeInitParams InitParams;
162162
InitParams.ParentNode = SharedThis(this);
163163
InitParams.Property = MyProperty;
164-
InitParams.ArrayOffset = Index*MyProperty->ElementSize;
164+
InitParams.ArrayOffset = Index*MyProperty->GetElementSize();
165165
InitParams.ArrayIndex = Index;
166166
InitParams.bAllowChildren = true;
167167
InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
@@ -192,7 +192,7 @@ void FItemPropertyNode::InitChildNodes()
192192
FPropertyNodeInitParams InitParams;
193193
InitParams.ParentNode = SharedThis(this);
194194
InitParams.Property = ArrayProperty->Inner;
195-
InitParams.ArrayOffset = Index * ArrayProperty->Inner->ElementSize;
195+
InitParams.ArrayOffset = Index * ArrayProperty->Inner->GetElementSize();
196196
InitParams.ArrayIndex = Index;
197197
InitParams.bAllowChildren = true;
198198
InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
@@ -648,7 +648,7 @@ FText FItemPropertyNode::GetDisplayName() const
648648

649649
if (EndIndex != -1)
650650
{
651-
TypeName.MidInline(0, EndIndex, false);
651+
TypeName.MidInline(0, EndIndex, EAllowShrinking::No);
652652
}
653653
}
654654

‎Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyHandleImpl.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,20 +106,20 @@ FPropertyAccess::Result FPropertyValueImpl::GetValueData( void*& OutAddress ) co
106106
FPropertyAccess::Result Res = FPropertyAccess::Fail;
107107
OutAddress = nullptr;
108108
TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
109-
if( PropertyNodePin.IsValid() )
109+
if (PropertyNodePin.IsValid())
110110
{
111111
uint8* ValueAddress = nullptr;
112112
FReadAddressList ReadAddresses;
113-
bool bAllValuesTheSame = PropertyNodePin->GetReadAddress( !!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false, true );
113+
bool bAllValuesTheSame = PropertyNodePin->GetReadAddress(!!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false, true);
114114

115-
if( (ReadAddresses.Num() > 0 && bAllValuesTheSame) || ReadAddresses.Num() == 1 )
115+
if ((ReadAddresses.Num() > 0 && bAllValuesTheSame) || ReadAddresses.Num() == 1)
116116
{
117117
ValueAddress = ReadAddresses.GetAddress(0);
118118
const FProperty* Property = PropertyNodePin->GetProperty();
119119
if (ValueAddress && Property)
120120
{
121121
const int32 Index = 0;
122-
OutAddress = ValueAddress + Index * Property->ElementSize;
122+
OutAddress = ValueAddress + Index * Property->GetElementSize();
123123
Res = FPropertyAccess::Success;
124124
}
125125
}
@@ -148,37 +148,37 @@ FString FPropertyValueImpl::GetPropertyValueArray() const
148148
{
149149
FString String;
150150
TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
151-
if( PropertyNodePin.IsValid() )
151+
if (PropertyNodePin.IsValid())
152152
{
153153
FReadAddressList ReadAddresses;
154154

155-
bool bSingleValue = PropertyNodePin->GetReadAddress( !!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false );
155+
bool bSingleValue = PropertyNodePin->GetReadAddress(!!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false);
156156

157-
if( bSingleValue )
157+
if (bSingleValue)
158158
{
159159
FProperty* NodeProperty = PropertyNodePin->GetProperty();
160-
if( NodeProperty != nullptr )
160+
if (NodeProperty != nullptr)
161161
{
162162
uint8* Addr = ReadAddresses.GetAddress(0);
163-
if( Addr )
163+
if (Addr)
164164
{
165-
if ( FArrayProperty* ArrayProperty = CastField<FArrayProperty>(NodeProperty) )
165+
if (FArrayProperty* ArrayProperty = CastField<FArrayProperty>(NodeProperty))
166166
{
167167
FScriptArrayHelper ArrayHelper(ArrayProperty, Addr);
168-
String = FString::Printf( TEXT("%(%d)"), ArrayHelper.Num() );
168+
String = FString::Printf(TEXT("%%(%d)"), ArrayHelper.Num());
169169
}
170-
else if ( CastField<FSetProperty>(NodeProperty) != nullptr )
170+
else if (CastField<FSetProperty>(NodeProperty) != nullptr)
171171
{
172-
String = FString::Printf( TEXT("%(%d)"), FScriptSetHelper::Num(Addr) );
172+
String = FString::Printf(TEXT("%%(%d)"), FScriptSetHelper::Num(Addr));
173173
}
174174
else if (FMapProperty* MapProperty = CastField<FMapProperty>(NodeProperty))
175175
{
176176
FScriptMapHelper MapHelper(MapProperty, Addr);
177-
String = FString::Printf(TEXT("%(%d)"), MapHelper.Num());
177+
String = FString::Printf(TEXT("%%(%d)"), MapHelper.Num());
178178
}
179179
else
180180
{
181-
String = FString::Printf( TEXT("%[%d]"), NodeProperty->ArrayDim );
181+
String = FString::Printf(TEXT("%%[%d]"), NodeProperty->ArrayDim);
182182
}
183183
}
184184
}

‎Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyNode.cpp‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "Serialization/ArchiveReplaceObjectRef.h"
77
#include "Components/ActorComponent.h"
88
//#include "Editor/UnrealEdEngine.h"
9-
//#include "Engine/UserDefinedStruct.h"
9+
//#include "StructUtils/UserDefinedStruct.h"
1010
#include "RuntimePropertyEditor/EditConditionContext.h"
1111
//#include "UnrealEdGlobals.h"
1212
//#include "ScopedTransaction.h"
@@ -807,7 +807,7 @@ FPropertyAccess::Result FPropertyNodeEditStack::InitializeInternal(const FProper
807807
if (Property == ParentProperty) // Static array items
808808
{
809809
// Static array property node creates subnodes that point to individual array items
810-
MemoryStack.Add(FMemoryFrame(Property, MemoryStack.Last().Memory + InNode->GetArrayIndex() * Property->ElementSize));
810+
MemoryStack.Add(FMemoryFrame(Property, MemoryStack.Last().Memory + InNode->GetArrayIndex() * Property->GetElementSize()));
811811
}
812812
else if (const FStructProperty* StructProp = CastField<FStructProperty>(ParentProperty)) // structs
813813
{
@@ -1953,7 +1953,7 @@ struct FPropertyItemComponentCollector
19531953
// either the associated property is not an array property, or it's the header for the property (meaning the entire array)
19541954
for ( int32 ArrayIndex = 0; ArrayIndex < Prop->ArrayDim; ArrayIndex++ )
19551955
{
1956-
ProcessProperty(Prop, ValueTracker.GetPropertyValueAddress() + ArrayIndex * Prop->ElementSize);
1956+
ProcessProperty(Prop, ValueTracker.GetPropertyValueAddress() + ArrayIndex * Prop->GetElementSize());
19571957
}
19581958
}
19591959
else
@@ -2031,7 +2031,7 @@ struct FPropertyItemComponentCollector
20312031
int32 ArraySize = ArrayHelper.Num();
20322032
for ( int32 ArrayIndex = 0; ArrayIndex < ArraySize; ArrayIndex++ )
20332033
{
2034-
ProcessProperty(ArrayProp->Inner, ArrayValue + ArrayIndex * ArrayProp->Inner->ElementSize);
2034+
ProcessProperty(ArrayProp->Inner, ArrayValue + ArrayIndex * ArrayProp->Inner->GetElementSize());
20352035
}
20362036

20372037
bResult = true;
@@ -2056,7 +2056,7 @@ struct FPropertyItemComponentCollector
20562056
{
20572057
FScriptSet* SetValuePtr = SetProp->GetPropertyValuePtr(PropertyValueAddress);
20582058

2059-
FScriptSetLayout SetLayout = SetValuePtr->GetScriptLayout(SetProp->ElementProp->ElementSize, SetProp->ElementProp->GetMinAlignment());
2059+
FScriptSetLayout SetLayout = SetValuePtr->GetScriptLayout(SetProp->ElementProp->GetElementSize(), SetProp->ElementProp->GetMinAlignment());
20602060
int32 ItemsLeft = SetValuePtr->Num();
20612061

20622062
for (int32 Index = 0; ItemsLeft > 0; ++Index)
@@ -2304,8 +2304,8 @@ bool FPropertyNode::GetDiffersFromDefault(const uint8* PropertyValueAddress, con
23042304
for (int32 Idx = 0; !bDiffersFromDefault && Idx < InProperty->ArrayDim; Idx++)
23052305
{
23062306
bDiffersFromDefaultValue = !InProperty->Identical(
2307-
PropertyValueAddress + Idx * InProperty->ElementSize,
2308-
PropertyDefaultAddress + Idx * InProperty->ElementSize,
2307+
PropertyValueAddress + Idx * InProperty->GetElementSize(),
2308+
PropertyDefaultAddress + Idx * InProperty->GetElementSize(),
23092309
PortFlags
23102310
);
23112311
}
@@ -2607,7 +2607,7 @@ FText FPropertyNode::GetResetToDefaultLabel()
26072607

26082608
if (DefaultValue.Len() > MaxValueLen)
26092609
{
2610-
DefaultValue.LeftInline( MaxValueLen, false );
2610+
DefaultValue.LeftInline( MaxValueLen, EAllowShrinking::No);
26112611
DefaultValue += TEXT( "..." );
26122612
}
26132613

@@ -2645,19 +2645,18 @@ bool FPropertyNode::IsReorderable()
26452645
*/
26462646
bool FPropertyNode::AdjustEnumPropDisplayName( UEnum *InEnum, FString& DisplayName ) const
26472647
{
2648+
#if WITH_EDITOR
26482649
// see if we have alternate text to use for displaying the value
2649-
UMetaData* PackageMetaData = InEnum->GetOutermost()->GetMetaData();
2650-
if (PackageMetaData)
2650+
FMetaData& PackageMetaData = InEnum->GetPackage()->GetMetaData();
2651+
FName AltDisplayName = FName(*(DisplayName+TEXT(".DisplayName")));
2652+
FString ValueText = PackageMetaData.GetValue(InEnum, AltDisplayName);
2653+
if (ValueText.Len() > 0)
26512654
{
2652-
FName AltDisplayName = FName(*(DisplayName+TEXT(".DisplayName")));
2653-
FString ValueText = PackageMetaData->GetValue(InEnum, AltDisplayName);
2654-
if (ValueText.Len() > 0)
2655-
{
2656-
// use the alternate text for this enum value
2657-
DisplayName = ValueText;
2658-
return true;
2659-
}
2660-
}
2655+
// use the alternate text for this enum value
2656+
DisplayName = ValueText;
2657+
return true;
2658+
}
2659+
#endif
26612660

26622661
//DisplayName has been unmodified
26632662
return false;

0 commit comments

Comments
 (0)