From 39168475d013c6fd4177bc3e9336072fb5ebb77f Mon Sep 17 00:00:00 2001 From: MrDanka Date: Fri, 9 Apr 2021 03:50:45 +0300 Subject: [PATCH] UE 4.26 Update --- .../MergeAssist/Private/GraphMergeHelper.cpp | 8 +++--- Source/MergeAssist/Private/MergeAssist.cpp | 4 +-- .../Private/SBlueprintMergeAssist.cpp | 6 ++-- .../Private/SBlueprintMergeAssist.h | 4 +-- .../MergeAssist/Private/SMergeGraphView.cpp | 28 +++++++++++++++---- Source/MergeAssist/Private/SMergeGraphView.h | 2 +- Source/MergeAssist/Private/SMergeTreeView.h | 4 +-- 7 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Source/MergeAssist/Private/GraphMergeHelper.cpp b/Source/MergeAssist/Private/GraphMergeHelper.cpp index f60004a..7ae08c7 100644 --- a/Source/MergeAssist/Private/GraphMergeHelper.cpp +++ b/Source/MergeAssist/Private/GraphMergeHelper.cpp @@ -345,13 +345,13 @@ UEdGraphNode* GraphMergeHelper::FindNodeInTargetGraph(UEdGraphNode* Node) } else if (Node->GetGraph() == LocalGraph) { - auto** FoundNode = LocalToBaseNodeMap.Find(Node); - if (FoundNode) BaseNode = *FoundNode; + auto** FoundNode1 = LocalToBaseNodeMap.Find(Node); + if (FoundNode1) BaseNode = *FoundNode1; } else if (Node->GetGraph() == RemoteGraph) { - auto** FoundNode = RemoteToBaseNodeMap.Find(Node); - if (FoundNode) BaseNode = *FoundNode; + auto** FoundNode2 = RemoteToBaseNodeMap.Find(Node); + if (FoundNode2) BaseNode = *FoundNode2; } // If we don't know what node it would be in the base graph, we can't diff --git a/Source/MergeAssist/Private/MergeAssist.cpp b/Source/MergeAssist/Private/MergeAssist.cpp index f60aff6..07990fd 100644 --- a/Source/MergeAssist/Private/MergeAssist.cpp +++ b/Source/MergeAssist/Private/MergeAssist.cpp @@ -3,7 +3,7 @@ #include "SBlueprintMergeAssist.h" #include "BlueprintMergeData.h" -#include "SDockTab.h" +#include "Widgets/Docking/SDockTab.h" #define LOCTEXT_NAMESPACE "FMergeAssistModule" @@ -52,7 +52,7 @@ void FMergeAssistModule::StartupModule() TabSpawnerEntry.SetTooltipText(LOCTEXT("TooltipText", "Open the Merge assist tool")); // @TODO: Stop the tab from opening by default - FGlobalTabmanager::Get()->InvokeTab(MergeAssistTabId); + FGlobalTabmanager::Get()->TryInvokeTab(MergeAssistTabId); } void FMergeAssistModule::ShutdownModule() diff --git a/Source/MergeAssist/Private/SBlueprintMergeAssist.cpp b/Source/MergeAssist/Private/SBlueprintMergeAssist.cpp index 5220cd9..d44e251 100644 --- a/Source/MergeAssist/Private/SBlueprintMergeAssist.cpp +++ b/Source/MergeAssist/Private/SBlueprintMergeAssist.cpp @@ -4,9 +4,9 @@ #include "SlateOptMacros.h" //#include "EditorStyle.h" -#include "MultiBoxBuilder.h" -#include "VerticalBox.h" -#include "SSplitter.h" +#include "Framework/MultiBox/MultiBoxBuilder.h" +#include "Components/VerticalBox.h" +#include "Widgets/Layout/SSplitter.h" #include "EditorStyle.h" #include "Unreal/SMergeAssetPickerView.h" diff --git a/Source/MergeAssist/Private/SBlueprintMergeAssist.h b/Source/MergeAssist/Private/SBlueprintMergeAssist.h index 2febd5e..d1aea65 100644 --- a/Source/MergeAssist/Private/SBlueprintMergeAssist.h +++ b/Source/MergeAssist/Private/SBlueprintMergeAssist.h @@ -3,9 +3,9 @@ #pragma once #include "CoreMinimal.h" -#include "DeclarativeSyntaxSupport.h" +#include "Widgets/DeclarativeSyntaxSupport.h" #include "Widgets/SCompoundWidget.h" -#include "SBox.h" +#include "Widgets/Layout/SBox.h" #include "BlueprintMergeData.h" #include "Unreal/MergeUtils.h" diff --git a/Source/MergeAssist/Private/SMergeGraphView.cpp b/Source/MergeAssist/Private/SMergeGraphView.cpp index 3fc625f..672447d 100644 --- a/Source/MergeAssist/Private/SMergeGraphView.cpp +++ b/Source/MergeAssist/Private/SMergeGraphView.cpp @@ -2,14 +2,15 @@ #include "SMergeGraphView.h" #include "SlateOptMacros.h" -#include "SSplitter.h" -#include "SDockTab.h" +#include "Widgets/Layout/SSplitter.h" +#include "Widgets/Docking/SDockTab.h" #include "EdGraph/EdGraph.h" + #include "SBlueprintDiff.h" #include "Engine/Blueprint.h" -#include "SCheckBox.h" +#include "Widgets/Input/SCheckBox.h" #include "BlueprintEditor.h" -#include "BlueprintEditorUtils.h" +#include "Kismet2/BlueprintEditorUtils.h" #include "GraphMergeHelper.h" #include "SMergeTreeView.h" @@ -77,6 +78,21 @@ struct FBlueprintRevPair const FRevisionInfo& RevData; }; +struct FMatchFName +{ + FMatchFName(FName InName) + : Name(InName) + { + } + + bool operator() (const UObject* Object) + { + return Object->GetFName() == Name; + } + + FName const Name; +}; + static UEdGraph* FindGraphByName(UBlueprint const& FromBlueprint, const FName& GraphName) { TArray Graphs; @@ -319,7 +335,7 @@ void SMergeGraphView::Construct(const FArguments& InArgs, const FBlueprintMergeD for (auto& Panel: DiffPanels) { // @TODO: Move generating the blueprint panel to the Details (blueprint) view once support for this has been added - Panel.GenerateMyBlueprintPanel(); + Panel.GenerateMyBlueprintWidget(); Panel.InitializeDiffPanel(); } @@ -403,7 +419,7 @@ TSharedRef SMergeGraphView::CreateMergeGraphTab(const FSpawnTabArgs& A { PanelContainer->AddSlot() [ - SAssignNew(Panel.GraphEditorBorder, SBox) + SAssignNew(Panel.GraphEditorBox, SBox) .VAlign(VAlign_Fill) [ SBlueprintDiff::DefaultEmptyPanel() diff --git a/Source/MergeAssist/Private/SMergeGraphView.h b/Source/MergeAssist/Private/SMergeGraphView.h index de608e6..b0b17f0 100644 --- a/Source/MergeAssist/Private/SMergeGraphView.h +++ b/Source/MergeAssist/Private/SMergeGraphView.h @@ -4,7 +4,7 @@ #include "CoreMinimal.h" #include "Widgets/SCompoundWidget.h" -#include "DeclarativeSyntaxSupport.h" +#include "Widgets/DeclarativeSyntaxSupport.h" #include "BlueprintMergeData.h" #include "SBlueprintDiff.h" diff --git a/Source/MergeAssist/Private/SMergeTreeView.h b/Source/MergeAssist/Private/SMergeTreeView.h index ac12f09..2260800 100644 --- a/Source/MergeAssist/Private/SMergeTreeView.h +++ b/Source/MergeAssist/Private/SMergeTreeView.h @@ -4,9 +4,9 @@ #include "CoreMinimal.h" #include "Widgets/SCompoundWidget.h" -#include "DeclarativeSyntaxSupport.h" +#include "Widgets/DeclarativeSyntaxSupport.h" -#include "STreeView.h" +#include "Widgets/Views/STreeView.h" #include struct IMergeTreeEntry