izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Backout] - 36787551

Browse Source 
Backing out the modification to prevent binding to array. Guarding beeing a cvar. Keeps the restriction for set and map

Original CL Desc
-----------------------------------------------------------------
StateTree:Prevents binding to array, set and map element. Remove the ability to create bindings in the editor. It will be reenabled once all the bugs are fixed.
#jira UE-220272
#rb Yoan.StAmant
#rnx

[CL 36858690 by patrick boutot in 5.5 branch]
This commit is contained in:
patrick boutot
2024-10-04 09:40:09 -04:00
parent 307e5a2273
commit 429b55a86c
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Plugins/Runtime/StateTree/Source/StateTreeEditorModule/Private/Customizations/StateTreeBindingExtension.cpp
+20 -12
View File
@@ -31,6 +31,12 @@
namespace UE::StateTree::PropertyBinding
{
bool GbAllowArrayElementBindings = false;
FAutoConsoleVariableRef CVarAllowArrayElementBindings(
TEXT("StateTree.Editor.AllowArrayElementBinding"),
GbAllowArrayElementBindings,
TEXT("Enable binding on array element in the StateTree editor."));
/** Information for the types gathered from a FStateTreePropertyRef property meta-data */
struct FRefTypeInfo
@@ -150,13 +156,6 @@ EStateTreePropertyUsage MakeStructPropertyPathFromPropertyHandle(TSharedPtr<cons
TSharedPtr<const IPropertyHandle> CurrentPropertyHandle = InPropertyHandle;
while (CurrentPropertyHandle.IsValid())
{
const int32 ArrayIndex = CurrentPropertyHandle->GetIndexInArray();
// Do not support TArray, TSet or TMap elements.
if (ArrayIndex != INDEX_NONE)
{
break;
}
const FProperty* Property = CurrentPropertyHandle->GetProperty();
if (Property)
{
@@ -170,7 +169,7 @@ EStateTreePropertyUsage MakeStructPropertyPathFromPropertyHandle(TSharedPtr<cons
// Store path up to the property which has ID.
Segment.SetName(Property->GetFName());
Segment.SetArrayIndex(ArrayIndex);
Segment.SetArrayIndex(CurrentPropertyHandle->GetIndexInArray());
// Store type of the object (e.g. for instanced objects or instanced structs).
if (const FObjectProperty* ObjectProperty = CastField<FObjectProperty>(Property))
@@ -210,12 +209,21 @@ EStateTreePropertyUsage MakeStructPropertyPathFromPropertyHandle(TSharedPtr<cons
TSharedPtr<const IPropertyHandle> ParentPropertyHandle = CurrentPropertyHandle->GetParentHandle();
if (ParentPropertyHandle.IsValid())
{
// Do not support TArray, TSet or TMap elements.
const FProperty* ParentProperty = ParentPropertyHandle->GetProperty();
if (ParentProperty
&& ParentProperty->IsA<FArrayProperty>()
&& Property->GetFName() == ParentProperty->GetFName())
if (ParentProperty)
{
CurrentPropertyHandle = ParentPropertyHandle;
if (UE::StateTree::PropertyBinding::GbAllowArrayElementBindings
&& ParentProperty->IsA<FArrayProperty>()
&& Property->GetFName() == ParentProperty->GetFName())
{
CurrentPropertyHandle = ParentPropertyHandle;
}
else if (ParentProperty->IsA<FMapProperty>() || ParentProperty->IsA<FSetProperty>())
{
// Prevents anything that uses TMap or TSet.
break;
}
}
}
}