Addressed UE 5.6 deprecations

MothDoctor · MothDoctor · commit daa3fefbc04a · 2025-05-15T20:32:40.000+02:00
diff --git a/Source/FlowEditor/Private/Asset/FlowObjectDiff.cpp b/Source/FlowEditor/Private/Asset/FlowObjectDiff.cpp
@@ -51,11 +51,19 @@ void FFlowObjectDiff::InitializeDetailsDiffFromNode(UEdGraphNode* Node, const UO
 
 	if (NodeDiffType == ENodeDiffType::Old && !OldDetailsView.IsValid())
 	{
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 		OldDetailsView = MakeShared<FDetailsDiff>(Object, FOnDisplayedPropertiesChanged());
+#else
+		OldDetailsView = MakeShared<FDetailsDiff>(Object);
+#endif
 	}
 	else if (NodeDiffType == ENodeDiffType::New && !NewDetailsView.IsValid())
 	{
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6		
 		NewDetailsView = MakeShared<FDetailsDiff>(Object, FOnDisplayedPropertiesChanged());
+#else
+		NewDetailsView = MakeShared<FDetailsDiff>(Object);
+#endif
 	}
 }
 
diff --git a/Source/FlowEditor/Private/Graph/FlowGraphConnectionDrawingPolicy.cpp b/Source/FlowEditor/Private/Graph/FlowGraphConnectionDrawingPolicy.cpp
@@ -112,15 +112,23 @@ void FFlowGraphConnectionDrawingPolicy::BuildPaths()
 	}
 }
 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 void FFlowGraphConnectionDrawingPolicy::DrawConnection(int32 LayerId, const FVector2D& Start, const FVector2D& End, const FConnectionParams& Params)
+#else
+void FFlowGraphConnectionDrawingPolicy::DrawConnection(int32 LayerId, const FVector2f& Start, const FVector2f& End, const FConnectionParams& Params)
+#endif
 {
 	switch (UFlowGraphSettings::Get()->ConnectionDrawType)
 	{
 		case EFlowConnectionDrawType::Default:
 			FConnectionDrawingPolicy::DrawConnection(LayerId, Start, End, Params);
 			break;
 		case EFlowConnectionDrawType::Circuit:
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
+			DrawCircuitSpline(LayerId, FVector2f(Start), FVector2f(End), Params);
+#else
 			DrawCircuitSpline(LayerId, Start, End, Params);
+#endif		
 			break;
 		default: ;
 	}
@@ -219,37 +227,41 @@ void FFlowGraphConnectionDrawingPolicy::Draw(TMap<TSharedRef<SWidget>, FArranged
 	FConnectionDrawingPolicy::Draw(InPinGeometries, ArrangedNodes);
 }
 
-void FFlowGraphConnectionDrawingPolicy::DrawCircuitSpline(const int32& LayerId, const FVector2D& Start, const FVector2D& End, const FConnectionParams& Params) const
+void FFlowGraphConnectionDrawingPolicy::DrawCircuitSpline(const int32& LayerId, const FVector2f& Start, const FVector2f& End, const FConnectionParams& Params) const
 {
-	const FVector2D StartingPoint = FVector2D(Start.X + UFlowGraphSettings::Get()->CircuitConnectionSpacing.X, Start.Y);
-	const FVector2D EndPoint = FVector2D(End.X - UFlowGraphSettings::Get()->CircuitConnectionSpacing.Y, End.Y);
-	const FVector2D ControlPoint = GetControlPoint(StartingPoint, EndPoint);
+	const FVector2f StartingPoint = FVector2f(Start.X + UFlowGraphSettings::Get()->CircuitConnectionSpacing.X, Start.Y);
+	const FVector2f EndPoint = FVector2f(End.X - UFlowGraphSettings::Get()->CircuitConnectionSpacing.Y, End.Y);
+	const FVector2f ControlPoint = GetControlPoint(StartingPoint, EndPoint);
 
-	const FVector2D StartDirection = (Params.StartDirection == EGPD_Output) ? FVector2D(1.0f, 0.0f) : FVector2D(-1.0f, 0.0f);
-	const FVector2D EndDirection = (Params.EndDirection == EGPD_Input) ? FVector2D(1.0f, 0.0f) : FVector2D(-1.0f, 0.0f);
+	const FVector2f StartDirection = (Params.StartDirection == EGPD_Output) ? FVector2f(1.0f, 0.0f) : FVector2f(-1.0f, 0.0f);
+	const FVector2f EndDirection = (Params.EndDirection == EGPD_Input) ? FVector2f(1.0f, 0.0f) : FVector2f(-1.0f, 0.0f);
 
 	DrawCircuitConnection(LayerId, Start, StartDirection, StartingPoint, EndDirection, Params);
 	DrawCircuitConnection(LayerId, StartingPoint, StartDirection, ControlPoint, EndDirection, Params);
 	DrawCircuitConnection(LayerId, ControlPoint, StartDirection, EndPoint, EndDirection, Params);
 	DrawCircuitConnection(LayerId, EndPoint, StartDirection, End, EndDirection, Params);
 }
 
-void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& LayerId, const FVector2D& Start, const FVector2D& StartDirection, const FVector2D& End, const FVector2D& EndDirection, const FConnectionParams& Params) const
+void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& LayerId, const FVector2f& Start, const FVector2f& StartDirection, const FVector2f& End, const FVector2f& EndDirection, const FConnectionParams& Params) const
 {
 	FSlateDrawElement::MakeDrawSpaceSpline(DrawElementsList, LayerId, Start, StartDirection, End, EndDirection, Params.WireThickness, ESlateDrawEffect::None, Params.WireColor);
 
 	if (Params.bDrawBubbles)
 	{
 		// This table maps distance along curve to alpha
 		FInterpCurve<float> SplineReparamTable;
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
+		const float SplineLength = MakeSplineReparamTable(FVector2D(Start), FVector2D(StartDirection), FVector2D(End), FVector2D(EndDirection), SplineReparamTable);
+#else
 		const float SplineLength = MakeSplineReparamTable(Start, StartDirection, End, EndDirection, SplineReparamTable);
+#endif
 
 		// Draw bubbles on the spline
 		if (Params.bDrawBubbles)
 		{
 			const float BubbleSpacing = 64.f * ZoomFactor;
 			const float BubbleSpeed = 192.f * ZoomFactor;
-			const FVector2D BubbleSize = BubbleImage->ImageSize * ZoomFactor * 0.2f * Params.WireThickness;
+			const FVector2f BubbleSize = BubbleImage->ImageSize * ZoomFactor * 0.2f * Params.WireThickness;
 
 			const float Time = (FPlatformTime::Seconds() - GStartTime);
 			const float BubbleOffset = FMath::Fmod(Time * BubbleSpeed, BubbleSpacing);
@@ -260,7 +272,7 @@ void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& Layer
 				if (Distance < SplineLength)
 				{
 					const float Alpha = SplineReparamTable.Eval(Distance, 0.f);
-					FVector2D BubblePos = FMath::CubicInterp(Start, StartDirection, End, EndDirection, Alpha);
+					FVector2f BubblePos = FMath::CubicInterp(Start, StartDirection, End, EndDirection, Alpha);
 					BubblePos -= (BubbleSize * 0.5f);
 
 					FSlateDrawElement::MakeBox(DrawElementsList, LayerId, FPaintGeometry(BubblePos, BubbleSize, ZoomFactor), BubbleImage, ESlateDrawEffect::None, Params.WireColor);
@@ -270,9 +282,9 @@ void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& Layer
 	}
 }
 
-FVector2D FFlowGraphConnectionDrawingPolicy::GetControlPoint(const FVector2D& Source, const FVector2D& Target)
+FVector2f FFlowGraphConnectionDrawingPolicy::GetControlPoint(const FVector2f& Source, const FVector2f& Target)
 {
-	const FVector2D Delta = Target - Source;
+	const FVector2f Delta = Target - Source;
 	const float Tangent = FMath::Tan(UFlowGraphSettings::Get()->CircuitConnectionAngle * (PI / 180.f));
 
 	const float DeltaX = FMath::Abs(Delta.X);
@@ -281,24 +293,24 @@ FVector2D FFlowGraphConnectionDrawingPolicy::GetControlPoint(const FVector2D& So
 	const float SlopeWidth = DeltaY / Tangent;
 	if (DeltaX > SlopeWidth)
 	{
-		return Delta.X > 0.f ? FVector2D(Target.X - SlopeWidth, Source.Y) : FVector2D(Source.X - SlopeWidth, Target.Y);
+		return Delta.X > 0.f ? FVector2f(Target.X - SlopeWidth, Source.Y) : FVector2f(Source.X - SlopeWidth, Target.Y);
 	}
 
 	const float SlopeHeight = DeltaX * Tangent;
 	if (DeltaY > SlopeHeight)
 	{
 		if (Delta.Y > 0.f)
 		{
-			return Delta.X < 0.f ? FVector2D(Source.X, Target.Y - SlopeHeight) : FVector2D(Target.X, Source.Y + SlopeHeight);
+			return Delta.X < 0.f ? FVector2f(Source.X, Target.Y - SlopeHeight) : FVector2f(Target.X, Source.Y + SlopeHeight);
 		}
 
 		if (Delta.X < 0.f)
 		{
-			return FVector2D(Source.X, Target.Y + SlopeHeight);
+			return FVector2f(Source.X, Target.Y + SlopeHeight);
 		}
 	}
 
-	return FVector2D(Target.X, Source.Y - SlopeHeight);
+	return FVector2f(Target.X, Source.Y - SlopeHeight);
 }
 
 bool FFlowGraphConnectionDrawingPolicy::ShouldChangeTangentForReroute(UFlowGraphNode_Reroute* Reroute)
diff --git a/Source/FlowEditor/Private/Graph/FlowGraphEditor.cpp b/Source/FlowEditor/Private/Graph/FlowGraphEditor.cpp
@@ -46,7 +46,11 @@ void SFlowGraphEditor::Construct(const FArguments& InArgs, const TSharedPtr<FFlo
 	Arguments._GraphEvents.OnSelectionChanged = FOnSelectionChanged::CreateSP(this, &SFlowGraphEditor::OnSelectedNodesChanged);
 	Arguments._GraphEvents.OnNodeDoubleClicked = FSingleNodeEvent::CreateSP(this, &SFlowGraphEditor::OnNodeDoubleClicked);
 	Arguments._GraphEvents.OnTextCommitted = FOnNodeTextCommitted::CreateSP(this, &SFlowGraphEditor::OnNodeTitleCommitted);
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 	Arguments._GraphEvents.OnSpawnNodeByShortcut = FOnSpawnNodeByShortcut::CreateStatic(&SFlowGraphEditor::OnSpawnGraphNodeByShortcut, static_cast<UEdGraph*>(FlowAsset->GetGraph()));
+#else
+	Arguments._GraphEvents.OnSpawnNodeByShortcutAtLocation = FOnSpawnNodeByShortcutAtLocation::CreateStatic(&SFlowGraphEditor::OnSpawnGraphNodeByShortcut, static_cast<UEdGraph*>(FlowAsset->GetGraph()));
+#endif
 
 	SGraphEditor::Construct(Arguments);
 }
@@ -286,7 +290,11 @@ void SFlowGraphEditor::RedoGraphAction()
 	GEditor->RedoTransaction();
 }
 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const FVector2D& InPosition, UEdGraph* InGraph)
+#else
+FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const FVector2f& InPosition, UEdGraph* InGraph)
+#endif
 {
 	UEdGraph* Graph = InGraph;
 
@@ -296,6 +304,7 @@ FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const F
 		if (Action.IsValid())
 		{
 			TArray<UEdGraphPin*> DummyPins;
+
 			Action->PerformAction(Graph, DummyPins, InPosition);
 			return FReply::Handled();
 		}
@@ -307,7 +316,11 @@ FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const F
 void SFlowGraphEditor::OnCreateComment() const
 {
 	FFlowGraphSchemaAction_NewComment CommentAction;
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 	CommentAction.PerformAction(FlowAsset->GetGraph(), nullptr, GetPasteLocation());
+#else
+	CommentAction.PerformAction(FlowAsset->GetGraph(), nullptr, GetPasteLocation2f());
+#endif
 }
 
 bool SFlowGraphEditor::IsTabFocused() const
@@ -657,7 +670,11 @@ bool SFlowGraphEditor::CanCopyNodes() const
 
 void SFlowGraphEditor::PasteNodes()
 {
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 	PasteNodesHere(GetPasteLocation());
+#else
+	PasteNodesHere(GetPasteLocation2f());
+#endif
 }
 
 void SFlowGraphEditor::PasteNodesHere(const FVector2D& Location)
diff --git a/Source/FlowEditor/Public/Graph/FlowGraphConnectionDrawingPolicy.h b/Source/FlowEditor/Public/Graph/FlowGraphConnectionDrawingPolicy.h
@@ -54,15 +54,19 @@ class FLOWEDITOR_API FFlowGraphConnectionDrawingPolicy : public FConnectionDrawi
 	void BuildPaths();
 
 	// FConnectionDrawingPolicy interface
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 	virtual void DrawConnection(int32 LayerId, const FVector2D& Start, const FVector2D& End, const FConnectionParams& Params) override;
+#else
+	virtual void DrawConnection(int32 LayerId, const FVector2f& Start, const FVector2f& End, const FConnectionParams& Params);
+#endif
 	virtual void DetermineWiringStyle(UEdGraphPin* OutputPin, UEdGraphPin* InputPin, FConnectionParams& Params) override;
 	virtual void Draw(TMap<TSharedRef<SWidget>, FArrangedWidget>& PinGeometries, FArrangedChildren& ArrangedNodes) override;
 	// End of FConnectionDrawingPolicy interface
 
 protected:
-	void DrawCircuitSpline(const int32& LayerId, const FVector2D& Start, const FVector2D& End, const FConnectionParams& Params) const;
-	void DrawCircuitConnection(const int32& LayerId, const FVector2D& Start, const FVector2D& StartDirection, const FVector2D& End, const FVector2D& EndDirection, const FConnectionParams& Params) const;
-	static FVector2D GetControlPoint(const FVector2D& Source, const FVector2D& Target);
+	void DrawCircuitSpline(const int32& LayerId, const FVector2f& Start, const FVector2f& End, const FConnectionParams& Params) const;
+	void DrawCircuitConnection(const int32& LayerId, const FVector2f& Start, const FVector2f& StartDirection, const FVector2f& End, const FVector2f& EndDirection, const FConnectionParams& Params) const;
+	static FVector2f GetControlPoint(const FVector2f& Source, const FVector2f& Target);
 
 	bool ShouldChangeTangentForReroute(class UFlowGraphNode_Reroute* Reroute);
 	bool FindPinCenter(const UEdGraphPin* Pin, FVector2D& OutCenter) const;
diff --git a/Source/FlowEditor/Public/Graph/FlowGraphEditor.h b/Source/FlowEditor/Public/Graph/FlowGraphEditor.h
@@ -46,7 +46,12 @@ class FLOWEDITOR_API SFlowGraphEditor : public SGraphEditor
 	static void UndoGraphAction();
 	static void RedoGraphAction();
 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6
 	static FReply OnSpawnGraphNodeByShortcut(FInputChord InChord, const FVector2D& InPosition, UEdGraph* InGraph);
+#else
+	static FReply OnSpawnGraphNodeByShortcut(FInputChord InChord, const FVector2f& InPosition, UEdGraph* InGraph);
+#endif
+
 	void OnCreateComment() const;
 
 public:

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,19 @@ void FFlowObjectDiff::InitializeDetailsDiffFromNode(UEdGraphNode* Node, const UO`
`51`	`51`
`52`	`52`	`if (NodeDiffType == ENodeDiffType::Old && !OldDetailsView.IsValid())`
`53`	`53`	`{`
	`54`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
`54`	`55`	`OldDetailsView = MakeShared<FDetailsDiff>(Object, FOnDisplayedPropertiesChanged());`
	`56`	`+#else`
	`57`	`+ OldDetailsView = MakeShared<FDetailsDiff>(Object);`
	`58`	`+#endif`
`55`	`59`	`}`
`56`	`60`	`else if (NodeDiffType == ENodeDiffType::New && !NewDetailsView.IsValid())`
`57`	`61`	`{`
	`62`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
`58`	`63`	`NewDetailsView = MakeShared<FDetailsDiff>(Object, FOnDisplayedPropertiesChanged());`
	`64`	`+#else`
	`65`	`+ NewDetailsView = MakeShared<FDetailsDiff>(Object);`
	`66`	`+#endif`
`59`	`67`	`}`
`60`	`68`	`}`
`61`	`69`
Original file line number	Diff line number	Diff line change
`@@ -112,15 +112,23 @@ void FFlowGraphConnectionDrawingPolicy::BuildPaths()`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
	`115`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
`115`	`116`	`void FFlowGraphConnectionDrawingPolicy::DrawConnection(int32 LayerId, const FVector2D& Start, const FVector2D& End, const FConnectionParams& Params)`
	`117`	`+#else`
	`118`	`+void FFlowGraphConnectionDrawingPolicy::DrawConnection(int32 LayerId, const FVector2f& Start, const FVector2f& End, const FConnectionParams& Params)`
	`119`	`+#endif`
`116`	`120`	`{`
`117`	`121`	`switch (UFlowGraphSettings::Get()->ConnectionDrawType)`
`118`	`122`	`{`
`119`	`123`	`case EFlowConnectionDrawType::Default:`
`120`	`124`	`FConnectionDrawingPolicy::DrawConnection(LayerId, Start, End, Params);`
`121`	`125`	`break;`
`122`	`126`	`case EFlowConnectionDrawType::Circuit:`
	`127`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
	`128`	`+ DrawCircuitSpline(LayerId, FVector2f(Start), FVector2f(End), Params);`
	`129`	`+#else`
`123`	`130`	`DrawCircuitSpline(LayerId, Start, End, Params);`
	`131`	`+#endif`
`124`	`132`	`break;`
`125`	`133`	`default: ;`
`126`	`134`	`}`
`@@ -219,37 +227,41 @@ void FFlowGraphConnectionDrawingPolicy::Draw(TMap<TSharedRef<SWidget>, FArranged`
`219`	`227`	`FConnectionDrawingPolicy::Draw(InPinGeometries, ArrangedNodes);`
`220`	`228`	`}`
`221`	`229`
`222`		`-void FFlowGraphConnectionDrawingPolicy::DrawCircuitSpline(const int32& LayerId, const FVector2D& Start, const FVector2D& End, const FConnectionParams& Params) const`
	`230`	`+void FFlowGraphConnectionDrawingPolicy::DrawCircuitSpline(const int32& LayerId, const FVector2f& Start, const FVector2f& End, const FConnectionParams& Params) const`
`223`	`231`	`{`
`224`		`- const FVector2D StartingPoint = FVector2D(Start.X + UFlowGraphSettings::Get()->CircuitConnectionSpacing.X, Start.Y);`
`225`		`- const FVector2D EndPoint = FVector2D(End.X - UFlowGraphSettings::Get()->CircuitConnectionSpacing.Y, End.Y);`
`226`		`- const FVector2D ControlPoint = GetControlPoint(StartingPoint, EndPoint);`
	`232`	`+ const FVector2f StartingPoint = FVector2f(Start.X + UFlowGraphSettings::Get()->CircuitConnectionSpacing.X, Start.Y);`
	`233`	`+ const FVector2f EndPoint = FVector2f(End.X - UFlowGraphSettings::Get()->CircuitConnectionSpacing.Y, End.Y);`
	`234`	`+ const FVector2f ControlPoint = GetControlPoint(StartingPoint, EndPoint);`
`227`	`235`
`228`		`- const FVector2D StartDirection = (Params.StartDirection == EGPD_Output) ? FVector2D(1.0f, 0.0f) : FVector2D(-1.0f, 0.0f);`
`229`		`- const FVector2D EndDirection = (Params.EndDirection == EGPD_Input) ? FVector2D(1.0f, 0.0f) : FVector2D(-1.0f, 0.0f);`
	`236`	`+ const FVector2f StartDirection = (Params.StartDirection == EGPD_Output) ? FVector2f(1.0f, 0.0f) : FVector2f(-1.0f, 0.0f);`
	`237`	`+ const FVector2f EndDirection = (Params.EndDirection == EGPD_Input) ? FVector2f(1.0f, 0.0f) : FVector2f(-1.0f, 0.0f);`
`230`	`238`
`231`	`239`	`DrawCircuitConnection(LayerId, Start, StartDirection, StartingPoint, EndDirection, Params);`
`232`	`240`	`DrawCircuitConnection(LayerId, StartingPoint, StartDirection, ControlPoint, EndDirection, Params);`
`233`	`241`	`DrawCircuitConnection(LayerId, ControlPoint, StartDirection, EndPoint, EndDirection, Params);`
`234`	`242`	`DrawCircuitConnection(LayerId, EndPoint, StartDirection, End, EndDirection, Params);`
`235`	`243`	`}`
`236`	`244`
`237`		`-void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& LayerId, const FVector2D& Start, const FVector2D& StartDirection, const FVector2D& End, const FVector2D& EndDirection, const FConnectionParams& Params) const`
	`245`	`+void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& LayerId, const FVector2f& Start, const FVector2f& StartDirection, const FVector2f& End, const FVector2f& EndDirection, const FConnectionParams& Params) const`
`238`	`246`	`{`
`239`	`247`	`FSlateDrawElement::MakeDrawSpaceSpline(DrawElementsList, LayerId, Start, StartDirection, End, EndDirection, Params.WireThickness, ESlateDrawEffect::None, Params.WireColor);`
`240`	`248`
`241`	`249`	`if (Params.bDrawBubbles)`
`242`	`250`	`{`
`243`	`251`	`// This table maps distance along curve to alpha`
`244`	`252`	`FInterpCurve<float> SplineReparamTable;`
	`253`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
	`254`	`+ const float SplineLength = MakeSplineReparamTable(FVector2D(Start), FVector2D(StartDirection), FVector2D(End), FVector2D(EndDirection), SplineReparamTable);`
	`255`	`+#else`
`245`	`256`	`const float SplineLength = MakeSplineReparamTable(Start, StartDirection, End, EndDirection, SplineReparamTable);`
	`257`	`+#endif`
`246`	`258`
`247`	`259`	`// Draw bubbles on the spline`
`248`	`260`	`if (Params.bDrawBubbles)`
`249`	`261`	`{`
`250`	`262`	`const float BubbleSpacing = 64.f * ZoomFactor;`
`251`	`263`	`const float BubbleSpeed = 192.f * ZoomFactor;`
`252`		`- const FVector2D BubbleSize = BubbleImage->ImageSize * ZoomFactor * 0.2f * Params.WireThickness;`
	`264`	`+ const FVector2f BubbleSize = BubbleImage->ImageSize * ZoomFactor * 0.2f * Params.WireThickness;`
`253`	`265`
`254`	`266`	`const float Time = (FPlatformTime::Seconds() - GStartTime);`
`255`	`267`	`const float BubbleOffset = FMath::Fmod(Time * BubbleSpeed, BubbleSpacing);`
`@@ -260,7 +272,7 @@ void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& Layer`
`260`	`272`	`if (Distance < SplineLength)`
`261`	`273`	`{`
`262`	`274`	`const float Alpha = SplineReparamTable.Eval(Distance, 0.f);`
`263`		`- FVector2D BubblePos = FMath::CubicInterp(Start, StartDirection, End, EndDirection, Alpha);`
	`275`	`+ FVector2f BubblePos = FMath::CubicInterp(Start, StartDirection, End, EndDirection, Alpha);`
`264`	`276`	`BubblePos -= (BubbleSize * 0.5f);`
`265`	`277`
`266`	`278`	`FSlateDrawElement::MakeBox(DrawElementsList, LayerId, FPaintGeometry(BubblePos, BubbleSize, ZoomFactor), BubbleImage, ESlateDrawEffect::None, Params.WireColor);`
`@@ -270,9 +282,9 @@ void FFlowGraphConnectionDrawingPolicy::DrawCircuitConnection(const int32& Layer`
`270`	`282`	`}`
`271`	`283`	`}`
`272`	`284`
`273`		`-FVector2D FFlowGraphConnectionDrawingPolicy::GetControlPoint(const FVector2D& Source, const FVector2D& Target)`
	`285`	`+FVector2f FFlowGraphConnectionDrawingPolicy::GetControlPoint(const FVector2f& Source, const FVector2f& Target)`
`274`	`286`	`{`
`275`		`- const FVector2D Delta = Target - Source;`
	`287`	`+ const FVector2f Delta = Target - Source;`
`276`	`288`	`const float Tangent = FMath::Tan(UFlowGraphSettings::Get()->CircuitConnectionAngle * (PI / 180.f));`
`277`	`289`
`278`	`290`	`const float DeltaX = FMath::Abs(Delta.X);`
`@@ -281,24 +293,24 @@ FVector2D FFlowGraphConnectionDrawingPolicy::GetControlPoint(const FVector2D& So`
`281`	`293`	`const float SlopeWidth = DeltaY / Tangent;`
`282`	`294`	`if (DeltaX > SlopeWidth)`
`283`	`295`	`{`
`284`		`- return Delta.X > 0.f ? FVector2D(Target.X - SlopeWidth, Source.Y) : FVector2D(Source.X - SlopeWidth, Target.Y);`
	`296`	`+ return Delta.X > 0.f ? FVector2f(Target.X - SlopeWidth, Source.Y) : FVector2f(Source.X - SlopeWidth, Target.Y);`
`285`	`297`	`}`
`286`	`298`
`287`	`299`	`const float SlopeHeight = DeltaX * Tangent;`
`288`	`300`	`if (DeltaY > SlopeHeight)`
`289`	`301`	`{`
`290`	`302`	`if (Delta.Y > 0.f)`
`291`	`303`	`{`
`292`		`- return Delta.X < 0.f ? FVector2D(Source.X, Target.Y - SlopeHeight) : FVector2D(Target.X, Source.Y + SlopeHeight);`
	`304`	`+ return Delta.X < 0.f ? FVector2f(Source.X, Target.Y - SlopeHeight) : FVector2f(Target.X, Source.Y + SlopeHeight);`
`293`	`305`	`}`
`294`	`306`
`295`	`307`	`if (Delta.X < 0.f)`
`296`	`308`	`{`
`297`		`- return FVector2D(Source.X, Target.Y + SlopeHeight);`
	`309`	`+ return FVector2f(Source.X, Target.Y + SlopeHeight);`
`298`	`310`	`}`
`299`	`311`	`}`
`300`	`312`
`301`		`- return FVector2D(Target.X, Source.Y - SlopeHeight);`
	`313`	`+ return FVector2f(Target.X, Source.Y - SlopeHeight);`
`302`	`314`	`}`
`303`	`315`
`304`	`316`	`bool FFlowGraphConnectionDrawingPolicy::ShouldChangeTangentForReroute(UFlowGraphNode_Reroute* Reroute)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,11 @@ void SFlowGraphEditor::Construct(const FArguments& InArgs, const TSharedPtr<FFlo`
`46`	`46`	`Arguments._GraphEvents.OnSelectionChanged = FOnSelectionChanged::CreateSP(this, &SFlowGraphEditor::OnSelectedNodesChanged);`
`47`	`47`	`Arguments._GraphEvents.OnNodeDoubleClicked = FSingleNodeEvent::CreateSP(this, &SFlowGraphEditor::OnNodeDoubleClicked);`
`48`	`48`	`Arguments._GraphEvents.OnTextCommitted = FOnNodeTextCommitted::CreateSP(this, &SFlowGraphEditor::OnNodeTitleCommitted);`
	`49`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
`49`	`50`	`Arguments._GraphEvents.OnSpawnNodeByShortcut = FOnSpawnNodeByShortcut::CreateStatic(&SFlowGraphEditor::OnSpawnGraphNodeByShortcut, static_cast<UEdGraph*>(FlowAsset->GetGraph()));`
	`51`	`+#else`
	`52`	`+ Arguments._GraphEvents.OnSpawnNodeByShortcutAtLocation = FOnSpawnNodeByShortcutAtLocation::CreateStatic(&SFlowGraphEditor::OnSpawnGraphNodeByShortcut, static_cast<UEdGraph*>(FlowAsset->GetGraph()));`
	`53`	`+#endif`
`50`	`54`
`51`	`55`	`SGraphEditor::Construct(Arguments);`
`52`	`56`	`}`
`@@ -286,7 +290,11 @@ void SFlowGraphEditor::RedoGraphAction()`
`286`	`290`	`GEditor->RedoTransaction();`
`287`	`291`	`}`
`288`	`292`
	`293`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
`289`	`294`	`FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const FVector2D& InPosition, UEdGraph* InGraph)`
	`295`	`+#else`
	`296`	`+FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const FVector2f& InPosition, UEdGraph* InGraph)`
	`297`	`+#endif`
`290`	`298`	`{`
`291`	`299`	`UEdGraph* Graph = InGraph;`
`292`	`300`
`@@ -296,6 +304,7 @@ FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const F`
`296`	`304`	`if (Action.IsValid())`
`297`	`305`	`{`
`298`	`306`	`TArray<UEdGraphPin*> DummyPins;`
	`307`	`+`
`299`	`308`	`Action->PerformAction(Graph, DummyPins, InPosition);`
`300`	`309`	`return FReply::Handled();`
`301`	`310`	`}`
`@@ -307,7 +316,11 @@ FReply SFlowGraphEditor::OnSpawnGraphNodeByShortcut(FInputChord InChord, const F`
`307`	`316`	`void SFlowGraphEditor::OnCreateComment() const`
`308`	`317`	`{`
`309`	`318`	`FFlowGraphSchemaAction_NewComment CommentAction;`
	`319`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
`310`	`320`	`CommentAction.PerformAction(FlowAsset->GetGraph(), nullptr, GetPasteLocation());`
	`321`	`+#else`
	`322`	`+ CommentAction.PerformAction(FlowAsset->GetGraph(), nullptr, GetPasteLocation2f());`
	`323`	`+#endif`
`311`	`324`	`}`
`312`	`325`
`313`	`326`	`bool SFlowGraphEditor::IsTabFocused() const`
`@@ -657,7 +670,11 @@ bool SFlowGraphEditor::CanCopyNodes() const`
`657`	`670`
`658`	`671`	`void SFlowGraphEditor::PasteNodes()`
`659`	`672`	`{`
	`673`	`+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION < 6`
`660`	`674`	`PasteNodesHere(GetPasteLocation());`
	`675`	`+#else`
	`676`	`+ PasteNodesHere(GetPasteLocation2f());`
	`677`	`+#endif`
`661`	`678`	`}`
`662`	`679`
`663`	`680`	`void SFlowGraphEditor::PasteNodesHere(const FVector2D& Location)`