Merge pull request 'Created the necessary changes for Unreal Engine 5.4' (#1) from update-to-5.4 into main

Reviewed-on: BattyBovine/ComboInput#1
This commit is contained in:
Jamie Greunbaum 2024-06-28 17:28:10 -04:00
commit 26b506eb0e
4 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@
"Description": "A set of components and classes for capturing Enhanced Input actions for buffering actions and stringing them into complex combos.",
"Category": "Input",
"CreatedBy": "Jamie Greunbaum",
"EngineVersion": "5.3.0",
"EngineVersion": "5.4.0",
"CanContainContent": true,
"IsBetaVersion": true,
"IsExperimentalVersion": true,

View File

@ -116,7 +116,7 @@ public:
public:
UPROPERTY()
class UEdGraph *EdGraph;
TObjectPtr<class UEdGraph> EdGraph;
UPROPERTY(BlueprintReadOnly, Category="Combo Input|Action|Editor")
bool bCanRenameNode;

View File

@ -95,7 +95,7 @@ public:
virtual UEdGraphNode *PerformAction(class UEdGraph *ParentGraph, UEdGraphPin *FromPin, const FVector2D Location, bool bSelectNewNode = true) override;
virtual void AddReferencedObjects(FReferenceCollector &Collector) override;
class UEdComboActionGraphNode *NodeTemplate;
TObjectPtr<class UEdComboActionGraphNode> NodeTemplate;
};
USTRUCT()
@ -114,7 +114,7 @@ public:
virtual UEdGraphNode *PerformAction(class UEdGraph *ParentGraph, UEdGraphPin *FromPin, const FVector2D Location, bool bSelectNewNode = true) override;
virtual void AddReferencedObjects(FReferenceCollector &Collector) override;
class UEdComboActionGraphEdge *NodeTemplate;
TObjectPtr<class UEdComboActionGraphEdge> NodeTemplate;
};

View File

@ -146,7 +146,7 @@ private:
class UComboActionGraphEditorSettings *ComboActionGraphEditorSettings;
class UComboActionGraph *EditingGraph;
TObjectPtr<class UComboActionGraph> EditingGraph;
//Toolbar
TSharedPtr<FAssetEditorToolbarComboActionGraph> ToolbarBuilder;