diff --git a/Plugins/Linter/Source/Linter/Private/LintRule.cpp b/Plugins/Linter/Source/Linter/Private/LintRule.cpp index 596aa31..507dd19 100644 --- a/Plugins/Linter/Source/Linter/Private/LintRule.cpp +++ b/Plugins/Linter/Source/Linter/Private/LintRule.cpp @@ -10,6 +10,7 @@ #include "IAssetRegistry.h" #include "IAssetTools.h" #include "AssetRegistryModule.h" +#include "Misc/EngineVersionComparison.h" ULintRule::ULintRule(const FObjectInitializer& ObjectInitializer) @@ -61,7 +62,7 @@ FName ULintRule::GetRuleBasedObjectVariantName_Implementation(UObject* ObjectToL UMaterialInterface* MI = Cast(ObjectToLint); if (MI != nullptr) { -#if ENGINE_MINOR_VERSION >= 25 +#if UE_VERSION_NEWER_THAN(4, 25, 0) TMicRecursionGuard RecursionGuard; #else UMaterialInterface::TMicRecursionGuard RecursionGuard; diff --git a/Plugins/Linter/Source/Linter/Private/LinterContentBrowserExtensions.cpp b/Plugins/Linter/Source/Linter/Private/LinterContentBrowserExtensions.cpp index 099c20d..c07bc85 100644 --- a/Plugins/Linter/Source/Linter/Private/LinterContentBrowserExtensions.cpp +++ b/Plugins/Linter/Source/Linter/Private/LinterContentBrowserExtensions.cpp @@ -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); @@ -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, diff --git a/Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp b/Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp index 65e9cbd..f8162b0 100644 --- a/Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp +++ b/Plugins/Linter/Source/Linter/Private/UI/LintWizard.cpp @@ -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" @@ -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; }) @@ -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(); })