Skip to content

Fix UE version check #8

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix UE version check #8

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
3 changes: 2 additions & 1 deletion Plugins/Linter/Source/Linter/Private/LintRule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "IAssetRegistry.h"
#include "IAssetTools.h"
#include "AssetRegistryModule.h"
#include "Misc/EngineVersionComparison.h"


ULintRule::ULintRule(const FObjectInitializer& ObjectInitializer)
Expand Down Expand Up @@ -61,7 +62,7 @@ FName ULintRule::GetRuleBasedObjectVariantName_Implementation(UObject* ObjectToL
UMaterialInterface* MI = Cast<UMaterialInterface>(ObjectToLint);
if (MI != nullptr)
{
#if ENGINE_MINOR_VERSION >= 25
#if UE_VERSION_NEWER_THAN(4, 25, 0)
TMicRecursionGuard RecursionGuard;
#else
UMaterialInterface::TMicRecursionGuard RecursionGuard;
Expand Down
5 changes: 5 additions & 0 deletions Plugins/Linter/Source/Linter/Private/LinterContentBrowserExtensions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "Framework/Commands/UIAction.h"
#include "Delegates/IDelegateInstance.h"
#include "TooltipEditor/TooltipTool.h"
#include "Misc/EngineVersionComparison.h"

#define LOCTEXT_NAMESPACE "Linter"
DEFINE_LOG_CATEGORY_STATIC(LinterContentBrowserExtensions, Log, All);
Expand Down Expand Up @@ -50,7 +51,11 @@ void FLinterContentBrowserExtensions::InstallHooks(FLinterModule* LinterModule,
{
lm->SetDesiredLintPaths(SelectedPaths);
}
#if UE_VERSION_NEWER_THAN(4, 26, 0)
FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"));
#else
FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"));
#endif
}
})),
NAME_None,
Expand Down
9 changes: 9 additions & 0 deletions Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "FileHelpers.h"
#include "Logging/MessageLog.h"
#include "Logging/TokenizedMessage.h"
#include "Misc/EngineVersionComparison.h"

#include "LinterStyle.h"
#include "LintRuleSet.h"
Expand Down Expand Up @@ -88,7 +89,11 @@ void SLintWizard::Construct(const FArguments& InArgs)
.FinishButtonText(LOCTEXT("FinishButtonText", "Close"))
.OnFinished_Lambda([&]()
{
#if UE_VERSION_NEWER_THAN(4, 26, 0)
FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
#else
FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"))->RequestCloseTab();
#endif
})
+ SWizard::Page()
.CanShow_Lambda([&]() { return RuleSets.Num() > 0; })
Expand Down Expand Up @@ -521,7 +526,11 @@ void SLintWizard::Construct(const FArguments& InArgs)
LOCTEXT("ZipTaskShortName", "Zip Project Task"), FEditorStyle::GetBrush(TEXT("MainFrame.CookContent")));
}

#if UE_VERSION_NEWER_THAN(4, 26, 0)
FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
#else
FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"))->RequestCloseTab();
#endif
}
return FReply::Handled();
})
Expand Down