From 67c0126322fb00b5e3e29a28bf815fcbae6ca996 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Fri, 28 Jun 2024 17:26:45 -0400 Subject: [PATCH] Created the necessary changes for Unreal Engine 5.4 --- ComboInput.uplugin | 2 +- Source/ComboInput/Public/ComboActionGraph.h | 2 +- Source/ComboInputEditor/Private/ComboActionGraphSchema.h | 4 ++-- .../Private/Ed/AssetEditor_ComboActionGraph.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ComboInput.uplugin b/ComboInput.uplugin index 6ff161b..82ab920 100644 --- a/ComboInput.uplugin +++ b/ComboInput.uplugin @@ -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, diff --git a/Source/ComboInput/Public/ComboActionGraph.h b/Source/ComboInput/Public/ComboActionGraph.h index 6d14bb4..9130bc8 100644 --- a/Source/ComboInput/Public/ComboActionGraph.h +++ b/Source/ComboInput/Public/ComboActionGraph.h @@ -116,7 +116,7 @@ public: public: UPROPERTY() - class UEdGraph *EdGraph; + TObjectPtr EdGraph; UPROPERTY(BlueprintReadOnly, Category="Combo Input|Action|Editor") bool bCanRenameNode; diff --git a/Source/ComboInputEditor/Private/ComboActionGraphSchema.h b/Source/ComboInputEditor/Private/ComboActionGraphSchema.h index 8fb55e6..a38e875 100644 --- a/Source/ComboInputEditor/Private/ComboActionGraphSchema.h +++ b/Source/ComboInputEditor/Private/ComboActionGraphSchema.h @@ -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 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 NodeTemplate; }; diff --git a/Source/ComboInputEditor/Private/Ed/AssetEditor_ComboActionGraph.h b/Source/ComboInputEditor/Private/Ed/AssetEditor_ComboActionGraph.h index d42055f..e215dd8 100644 --- a/Source/ComboInputEditor/Private/Ed/AssetEditor_ComboActionGraph.h +++ b/Source/ComboInputEditor/Private/Ed/AssetEditor_ComboActionGraph.h @@ -146,7 +146,7 @@ private: class UComboActionGraphEditorSettings *ComboActionGraphEditorSettings; - class UComboActionGraph *EditingGraph; + TObjectPtr EditingGraph; //Toolbar TSharedPtr ToolbarBuilder;