Skip to content

UE 4.26 Update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lihomanovdv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UE 4.26 Update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Source/MergeAssist/Private/GraphMergeHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/MergeAssist/Private/MergeAssist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "SBlueprintMergeAssist.h"
#include "BlueprintMergeData.h"

#include "SDockTab.h"
#include "Widgets/Docking/SDockTab.h"

#define LOCTEXT_NAMESPACE "FMergeAssistModule"

Expand Down Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions Source/MergeAssist/Private/SBlueprintMergeAssist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions Source/MergeAssist/Private/SBlueprintMergeAssist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 22 additions & 6 deletions Source/MergeAssist/Private/SMergeGraphView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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<UEdGraph*> Graphs;
Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -403,7 +419,7 @@ TSharedRef<SDockTab> SMergeGraphView::CreateMergeGraphTab(const FSpawnTabArgs& A
{
PanelContainer->AddSlot()
[
SAssignNew(Panel.GraphEditorBorder, SBox)
SAssignNew(Panel.GraphEditorBox, SBox)
.VAlign(VAlign_Fill)
[
SBlueprintDiff::DefaultEmptyPanel()
Expand Down
2 changes: 1 addition & 1 deletion Source/MergeAssist/Private/SMergeGraphView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "CoreMinimal.h"
#include "Widgets/SCompoundWidget.h"
#include "DeclarativeSyntaxSupport.h"
#include "Widgets/DeclarativeSyntaxSupport.h"
#include "BlueprintMergeData.h"
#include "SBlueprintDiff.h"

Expand Down
4 changes: 2 additions & 2 deletions Source/MergeAssist/Private/SMergeTreeView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <functional>

struct IMergeTreeEntry
Expand Down