Skip to content

Commit 00305fc

Browse files
crocuiscrocuis
authored
Merge pull request #72 from naughtiest/fix-version-dep
Fix version dependancies
2 parents 7dc4f66 + 1b06021 commit 00305fc

28 files changed

+130
-84
lines changed

‎Source/JavascriptEditor/JavascriptEdMode.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ class FJavascriptEdModeFactory : public IEditorModeFactory, public FGCObject
388388
return MakeShareable(new FJavascriptEdModeInstance(Parent));
389389
}
390390

391-
#if ENGINE_MINOR_VERSION < 26
391+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26
392392
virtual UEdMode* CreateScriptableMode() const override
393393
{
394394
return nullptr;

‎Source/JavascriptEditor/JavascriptEditor.Build.cs

+27-16
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
using UnrealBuildTool;
1+
using System;
2+
using UnrealBuildTool;
23

34
public class JavascriptEditor : ModuleRules
45
{
5-
public static bool IsVREditorNeeded()
6+
public static Int32[] ParseEditorVersions()
67
{
78
string[] VersionHeader = Utils.ReadAllText("../Source/Runtime/Launch/Resources/Version.h").Replace("\r\n", "\n").Replace("\t", " ").Split('\n');
89
string EngineVersionMajor = "4";
@@ -18,7 +19,7 @@ public static bool IsVREditorNeeded()
1819
EngineVersionMinor = Line.Split(' ')[2];
1920
}
2021
}
21-
return System.Int32.Parse(EngineVersionMajor) == 4 && System.Int32.Parse(EngineVersionMinor) >= 14;
22+
return new Int32[] { System.Int32.Parse(EngineVersionMajor), System.Int32.Parse(EngineVersionMinor) };
2223
}
2324

2425
public JavascriptEditor(ReadOnlyTargetRules Target) : base(Target)
@@ -54,7 +55,12 @@ public JavascriptEditor(ReadOnlyTargetRules Target) : base(Target)
5455
}
5556
);
5657

57-
if (IsVREditorNeeded())
58+
var vers = ParseEditorVersions();
59+
var EngineMajorVer = vers[0];
60+
var EngineMinorVer = vers[1];
61+
62+
// Is VREditor Needed?
63+
if (EngineMajorVer > 4 || EngineMinorVer >= 14)
5864
{
5965
PrivateDependencyModuleNames.AddRange(new string []{ "LevelEditor", "ViewportInteraction", "VREditor" });
6066
}
@@ -95,19 +101,24 @@ public JavascriptEditor(ReadOnlyTargetRules Target) : base(Target)
95101
"StaticMeshEditor"
96102
}
97103
);
104+
105+
if (EngineMajorVer > 4)
106+
{
107+
PrivateDependencyModuleNames.Add("EditorFramework");
108+
}
98109
}
99110

100-
// Uncomment if you are using Slate UI
101-
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
111+
// Uncomment if you are using Slate UI
112+
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
102113

103-
// Uncomment if you are using online features
104-
// PrivateDependencyModuleNames.Add("OnlineSubsystem");
105-
// if ((Target.Platform == UnrealTargetPlatform.Win32) || (Target.Platform == UnrealTargetPlatform.Win64))
106-
// {
107-
// if (UEBuildConfiguration.bCompileSteamOSS == true)
108-
// {
109-
// DynamicallyLoadedModuleNames.Add("OnlineSubsystemSteam");
110-
// }
111-
// }
112-
}
114+
// Uncomment if you are using online features
115+
// PrivateDependencyModuleNames.Add("OnlineSubsystem");
116+
// if (Target.IsInPlatformGroup(UnrealPlatformGroup.Windows))
117+
// {
118+
// if (UEBuildConfiguration.bCompileSteamOSS == true)
119+
// {
120+
// DynamicallyLoadedModuleNames.Add("OnlineSubsystemSteam");
121+
// }
122+
// }
123+
}
113124
}

‎Source/JavascriptEditor/JavascriptEditorLibrary.cpp

+23-5
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@
6060

6161
#include "Engine/DataTable.h"
6262
#include "Engine/EngineTypes.h"
63-
#include "Toolkits/AssetEditorManager.h"
63+
#if ENGINE_MAJOR_VERSION == 4
64+
#include "Toolkits/AssetEditorManager.h"
65+
#endif
6466
#include "Kismet2/KismetEditorUtilities.h"
6567

6668
#if WITH_EDITOR
@@ -202,18 +204,30 @@ void UJavascriptEditorLibrary::OpenPopupWindow(UWidget* Widget, const FVector2D&
202204

203205
void UJavascriptEditorLibrary::GetAllTags(const FJavascriptAssetData& AssetData, TArray<FName>& OutArray)
204206
{
207+
#if ENGINE_MAJOR_VERSION > 4
208+
AssetData.SourceAssetData.TagsAndValues.CopyMap().GetKeys(OutArray);
209+
#else
205210
AssetData.SourceAssetData.TagsAndValues.GetKeys(OutArray);
211+
#endif
206212
}
207213

208214
bool UJavascriptEditorLibrary::GetTagValue(const FJavascriptAssetData& AssetData, const FName& Name, FString& OutValue)
209215
{
216+
#if ENGINE_MAJOR_VERSION > 4
217+
auto Value = AssetData.SourceAssetData.TagsAndValues.FindTag(Name);
218+
if (Value.IsSet())
219+
{
220+
OutValue = Value.GetValue();
221+
return true;
222+
}
223+
#else
210224
auto Value = AssetData.SourceAssetData.TagsAndValues.GetMap().Find(Name);
211-
212225
if (Value)
213226
{
214227
OutValue = *Value;
215228
return true;
216229
}
230+
#endif
217231
else
218232
{
219233
return false;
@@ -496,7 +510,7 @@ void UJavascriptEditorLibrary::DrawPolygon(const FJavascriptPDI& PDI, const TArr
496510
}
497511

498512
static auto TransparentPlaneMaterialXY = (UMaterial*)StaticLoadObject(UMaterial::StaticClass(), NULL, TEXT("/Engine/EditorMaterials/WidgetVertexColorMaterial.WidgetVertexColorMaterial"), NULL, LOAD_None, NULL);
499-
#if ENGINE_MINOR_VERSION < 22
513+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22
500514
MeshBuilder.Draw(PDI.PDI, FMatrix::Identity, TransparentPlaneMaterialXY->GetRenderProxy(false), DepthPriority, 0.f);
501515
#else
502516
MeshBuilder.Draw(PDI.PDI, FMatrix::Identity, TransparentPlaneMaterialXY->GetRenderProxy(), DepthPriority, 0.f);
@@ -691,7 +705,11 @@ FJavascriptSlateWidget UJavascriptEditorLibrary::GetRootWindow()
691705
void UJavascriptEditorLibrary::CreatePropertyEditorToolkit(TArray<UObject*> ObjectsForPropertiesMenu)
692706
{
693707
FPropertyEditorModule& PropertyEditorModule = FModuleManager::LoadModuleChecked<FPropertyEditorModule>("PropertyEditor");
708+
#if ENGINE_MAJOR_VERSION > 4
709+
PropertyEditorModule.CreatePropertyEditorToolkit(TSharedPtr<IToolkitHost>(), ObjectsForPropertiesMenu);
710+
#else
694711
PropertyEditorModule.CreatePropertyEditorToolkit(EToolkitMode::Standalone, TSharedPtr<IToolkitHost>(), ObjectsForPropertiesMenu);
712+
#endif
695713
}
696714

697715
static FName NAME_LevelEditor("LevelEditor");
@@ -1310,7 +1328,7 @@ bool UJavascriptEditorLibrary::LoadImageFromDiskAsync(const FString& ImagePath,
13101328
{
13111329
Texture->SRGB = true;
13121330
Texture->UpdateResource();
1313-
#if ENGINE_MINOR_VERSION < 22
1331+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22
13141332
ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER(
13151333
FWriteRawDataToTexture,
13161334
FTexture2DDynamicResource*, TextureResource, static_cast<FTexture2DDynamicResource*>(Texture->Resource),
@@ -1432,7 +1450,7 @@ FString UJavascriptEditorLibrary::GetDataTableAsJSON(UDataTable* InDataTable, ui
14321450

14331451
void UJavascriptEditorLibrary::AddRichCurve(UCurveTable* InCurveTable, const FName& Key, const FRichCurve& InCurve)
14341452
{
1435-
#if ENGINE_MINOR_VERSION < 22
1453+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22
14361454
FRichCurve* NewCurve = new FRichCurve();
14371455
NewCurve->SetKeys(InCurve.GetConstRefOfKeys());
14381456
NewCurve->PreInfinityExtrap = InCurve.PreInfinityExtrap;

‎Source/JavascriptEditor/JavascriptEditorViewport.cpp

+21-12
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@
88
#include "AssetViewerSettings.h"
99
#include "Launch/Resources/Version.h"
1010
#include "Components/DirectionalLightComponent.h"
11+
#if ENGINE_MAJOR_VERSION > 4
12+
#include "UnrealWidget.h"
13+
#endif
1114

1215
#define LOCTEXT_NAMESPACE "JavascriptEditor"
1316

1417
PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
1518

19+
#if ENGINE_MAJOR_VERSION > 4
20+
namespace WidgetAlias = UE::Widget;
21+
#else
22+
using WidgetAlias = FWidget;
23+
#endif
24+
1625
class FJavascriptPreviewScene : public FAdvancedPreviewScene
1726
{
1827
public:
@@ -38,7 +47,7 @@ class FJavascriptPreviewScene : public FAdvancedPreviewScene
3847
{
3948
return SkyComponent;
4049
}
41-
#if ENGINE_MINOR_VERSION < 23
50+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23
4251
class USphereReflectionCaptureComponent* GetDefaultSphereReflectionComponent()
4352
{
4453
return SphereReflectionComponent;
@@ -208,11 +217,11 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient
208217
}
209218
}
210219

211-
virtual FWidget::EWidgetMode GetWidgetMode() const override
220+
virtual WidgetAlias::EWidgetMode GetWidgetMode() const override
212221
{
213222
if (Widget.IsValid() && Widget->OnGetWidgetMode.IsBound())
214223
{
215-
return (FWidget::EWidgetMode)Widget->OnGetWidgetMode.Execute(Widget.Get());
224+
return (WidgetAlias::EWidgetMode)Widget->OnGetWidgetMode.Execute(Widget.Get());
216225
}
217226
else
218227
{
@@ -265,7 +274,7 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient
265274
{
266275
for (FActorIterator It(PreviewScene->GetWorld()); It; ++It)
267276
{
268-
#if ENGINE_MINOR_VERSION > 14
277+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 14) || ENGINE_MAJOR_VERSION > 4
269278
It->DispatchBeginPlay();
270279
#else
271280
if (It->HasActorBegunPlay() == false)
@@ -447,13 +456,13 @@ class SAutoRefreshEditorViewport : public SEditorViewport
447456

448457
void SetWidgetMode(EJavascriptWidgetMode WidgetMode)
449458
{
450-
EditorViewportClient->SetWidgetMode(WidgetMode == EJavascriptWidgetMode::WM_None ? FWidget::WM_None : (FWidget::EWidgetMode)WidgetMode);
459+
EditorViewportClient->SetWidgetMode(WidgetMode == EJavascriptWidgetMode::WM_None ? WidgetAlias::WM_None : (WidgetAlias::EWidgetMode)WidgetMode);
451460
}
452461

453462
EJavascriptWidgetMode GetWidgetMode()
454463
{
455-
FWidget::EWidgetMode WidgetMode = EditorViewportClient->GetWidgetMode();
456-
return FWidget::WM_None ? EJavascriptWidgetMode::WM_None : (EJavascriptWidgetMode)WidgetMode;
464+
WidgetAlias::EWidgetMode WidgetMode = EditorViewportClient->GetWidgetMode();
465+
return WidgetAlias::WM_None ? EJavascriptWidgetMode::WM_None : (EJavascriptWidgetMode)WidgetMode;
457466
}
458467

459468
FString GetEngineShowFlags()
@@ -508,7 +517,7 @@ class SAutoRefreshEditorViewport : public SEditorViewport
508517
{
509518
return PreviewScene.GetDefaultSkySphereComponent();
510519
}
511-
#if ENGINE_MINOR_VERSION < 23
520+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23
512521
class USphereReflectionCaptureComponent* GetDefaultSphereReflectionComponent()
513522
{
514523
return PreviewScene.GetDefaultSphereReflectionComponent();
@@ -534,7 +543,7 @@ class SAutoRefreshEditorViewport : public SEditorViewport
534543
UStaticMeshComponent* Component = *Itr;
535544
if (Component && Component->GetOwner() == nullptr)
536545
{
537-
#if ENGINE_MINOR_VERSION >= 14
546+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14) || ENGINE_MAJOR_VERSION > 4
538547
auto StaticMesh = Component->GetStaticMesh();
539548
#else
540549
auto StaticMesh = Component->StaticMesh;
@@ -838,7 +847,7 @@ void UJavascriptEditorViewport::DeprojectScreenToWorld(const FVector2D &ScreenPo
838847
FSceneViewFamilyContext ViewFamily(FSceneViewFamily::ConstructionValues( ViewportWidget->EditorViewportClient->Viewport, ViewportWidget->EditorViewportClient->GetScene(), ViewportWidget->EditorViewportClient->EngineShowFlags ));
839848
FSceneView* View = ViewportWidget->EditorViewportClient->CalcSceneView(&ViewFamily);
840849

841-
#if ENGINE_MINOR_VERSION >= 14
850+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14) || ENGINE_MAJOR_VERSION > 4
842851
const auto& InvViewProjMatrix = View->ViewMatrices.GetInvViewProjectionMatrix();
843852
#else
844853
const auto& InvViewProjMatrix = View->ViewMatrices.GetInvViewProjMatrix();
@@ -854,7 +863,7 @@ void UJavascriptEditorViewport::ProjectWorldToScreen(const FVector &WorldPositio
854863
FSceneViewFamilyContext ViewFamily(FSceneViewFamily::ConstructionValues( ViewportWidget->EditorViewportClient->Viewport, ViewportWidget->EditorViewportClient->GetScene(), ViewportWidget->EditorViewportClient->EngineShowFlags ));
855864
FSceneView* View = ViewportWidget->EditorViewportClient->CalcSceneView(&ViewFamily);
856865

857-
#if ENGINE_MINOR_VERSION >= 14
866+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14) || ENGINE_MAJOR_VERSION > 4
858867
const auto& ViewProjMatrix = View->ViewMatrices.GetViewProjectionMatrix();
859868
#else
860869
const auto& ViewProjMatrix = View->ViewMatrices.GetViewProjMatrix();
@@ -970,7 +979,7 @@ class UStaticMeshComponent* UJavascriptEditorViewport::GetDefaultSkySphereCompon
970979

971980
class USphereReflectionCaptureComponent* UJavascriptEditorViewport::GetDefaultSphereReflectionComponent()
972981
{
973-
#if ENGINE_MINOR_VERSION < 23
982+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23
974983
if (ViewportWidget.IsValid())
975984
{
976985
return ViewportWidget->GetDefaultSphereReflectionComponent();

‎Source/JavascriptEditor/JavascriptMenuLibrary.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ void UJavascriptMenuLibrary::AddSeparator(FJavascriptMenuBuilder& Builder)
8989
else if (Builder.ToolMenu)
9090
{
9191
FToolMenuSection& Section = Builder.ToolMenu->Sections.Num() > 0 ? Builder.ToolMenu->Sections.Top() : Builder.ToolMenu->AddSection(FName());
92+
#if ENGINE_MAJOR_VERSION > 4
9293
Section.AddSeparator(FName());
94+
#else
95+
Section.AddMenuSeparator(FName());
96+
#endif
9397
}
9498
}
9599

@@ -152,7 +156,7 @@ void UJavascriptMenuLibrary::AddMenuEntry(FJavascriptMenuBuilder& Builder, UJava
152156
DefaultAction.CanExecuteAction = FCanExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_CanExecute);
153157
DefaultAction.ExecuteAction = FExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_Execute);
154158
DefaultAction.GetActionCheckState = FGetActionCheckState::CreateUObject(Object, &UJavascriptMenuContext::Public_GetActionCheckState);
155-
#if ENGINE_MINOR_VERSION > 22
159+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4
156160
const EUserInterfaceActionType CommandType = EUserInterfaceActionType(Object->ActionType.GetValue());
157161
#else
158162
const EUserInterfaceActionType::Type CommandType = EUserInterfaceActionType::Type(Object->ActionType.GetValue());
@@ -172,7 +176,7 @@ void UJavascriptMenuLibrary::AddMenuEntry(FJavascriptMenuBuilder& Builder, UJava
172176
DefaultAction.CanExecuteAction = FCanExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_CanExecute);
173177
DefaultAction.ExecuteAction = FExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_Execute);
174178
DefaultAction.GetActionCheckState = FGetActionCheckState::CreateUObject(Object, &UJavascriptMenuContext::Public_GetActionCheckState);
175-
#if ENGINE_MINOR_VERSION > 22
179+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4
176180
const EUserInterfaceActionType CommandType = EUserInterfaceActionType(Object->ActionType.GetValue());
177181
#else
178182
const EUserInterfaceActionType::Type CommandType = EUserInterfaceActionType::Type(Object->ActionType.GetValue());
@@ -318,7 +322,7 @@ FJavascriptUICommandInfo UJavascriptMenuLibrary::UI_COMMAND_Function(FJavascript
318322
const FString DotOutCommandName = FString::Printf(TEXT(".%s"), *info.Id);
319323
const TCHAR* FriendlyName = *info.FriendlyName;
320324
const TCHAR* InDescription = *info.Description;
321-
#if ENGINE_MINOR_VERSION > 22
325+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4
322326
const EUserInterfaceActionType CommandType = EUserInterfaceActionType(info.ActionType.GetValue());
323327
#else
324328
const EUserInterfaceActionType::Type CommandType = EUserInterfaceActionType::Type(info.ActionType.GetValue());

‎Source/JavascriptEditor/JavascriptUICommands.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void UJavascriptUICommands::Uninitialize()
6464

6565
void UJavascriptUICommands::BroadcastCommandsChanged(const FString& InContextName)
6666
{
67-
#if ENGINE_MINOR_VERSION > 14
67+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 14) || ENGINE_MAJOR_VERSION > 4
6868
TSharedPtr<FBindingContext> ExistingBindingContext = FInputBindingManager::Get().GetContextByName(*InContextName);
6969
if (ExistingBindingContext.IsValid())
7070
{

‎Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void UJavascriptGraphAssetGraphSchema::GetGraphContextActions(FGraphContextMenuB
7676
}
7777
}
7878

79-
#if ENGINE_MINOR_VERSION < 24
79+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 24
8080
void UJavascriptGraphAssetGraphSchema::GetContextMenuActions(const UEdGraph* CurrentGraph, const UEdGraphNode* InGraphNode, const UEdGraphPin* InGraphPin, class FMenuBuilder* MenuBuilder, bool bIsDebugging) const
8181
{
8282
if (OnBuildMenu.IsBound())

‎Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class UJavascriptGraphAssetGraphSchema : public UEdGraphSchema
293293

294294
//~ Begin EdGraphSchema Interface
295295
virtual void GetGraphContextActions(FGraphContextMenuBuilder& ContextMenuBuilder) const override;
296-
#if ENGINE_MINOR_VERSION < 24
296+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 24
297297
virtual void GetContextMenuActions(const UEdGraph* CurrentGraph, const UEdGraphNode* InGraphNode, const UEdGraphPin* InGraphPin, class FMenuBuilder* MenuBuilder, bool bIsDebugging) const override;
298298
#else
299299
virtual void GetContextMenuActions(class UToolMenu* Menu, class UGraphNodeContextMenuContext* Context) const override;

‎Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ FJavascriptArrangedWidget UJavascriptGraphEditorLibrary::FindPinGeometries(FJava
241241
FJavascriptPinWidget UJavascriptGraphEditorLibrary::FindPinToPinWidgetMap(FJavascriptDetermineLinkGeometryContainer Container, FJavascriptEdGraphPin Pin)
242242
{
243243
FJavascriptPinWidget Widget = FJavascriptPinWidget();
244-
#if ENGINE_MINOR_VERSION > 22
244+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4
245245
TSharedPtr<SGraphPin>* SGraphPinHandle = Container.PinToPinWidgetMap->Find(Pin);
246246
if (SGraphPinHandle)
247247
{

‎Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ struct FJavascriptDetermineLinkGeometryContainer
105105
TSharedRef<SWidget>* InOutputPinWidget,
106106
TMap<UEdGraphNode*, int32>* InNodeWidgetMap,
107107
TMap<TSharedRef<SWidget>, FArrangedWidget>* InPinGeometries,
108-
#if ENGINE_MINOR_VERSION > 22
108+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4
109109
TMap< UEdGraphPin*, TSharedPtr<SGraphPin> >* InPinToPinWidgetMap
110110
#else
111111
TMap< UEdGraphPin*, TSharedRef<SGraphPin> >* InPinToPinWidgetMap
@@ -124,7 +124,7 @@ struct FJavascriptDetermineLinkGeometryContainer
124124
TMap<UEdGraphNode*, int32>* NodeWidgetMap;
125125

126126
TMap<TSharedRef<SWidget>, FArrangedWidget>* PinGeometries;
127-
#if ENGINE_MINOR_VERSION > 22
127+
#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4
128128
TMap< UEdGraphPin*, TSharedPtr<SGraphPin> >* PinToPinWidgetMap;
129129
#else
130130
TMap< UEdGraphPin*, TSharedRef<SGraphPin> >* PinToPinWidgetMap;

‎Source/JavascriptGraphEditor/JavascriptGraphTextPropertyEditableTextBox.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class FJavascriptEditableTextGraphPin : public IEditableTextProperty
3636
virtual bool IsDefaultValue() const override
3737
{
3838
FString TextAsString;
39-
#if ENGINE_MINOR_VERSION < 22
39+
#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22
4040
if (FTextStringHelper::WriteToString(TextAsString, GraphPinObj->DefaultTextValue))
4141
{
4242
return TextAsString.Equals(GraphPinObj->AutogeneratedDefaultValue, ESearchCase::CaseSensitive);

0 commit comments

Comments
 (0)