Skip to content
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

Jump to bottom

5.0.0-release patchups #4

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

5.0.0-release patchups #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fddd8b
5.0.0-release pathups
GlebShikovec Apr 15, 2022
8579f57
Fix engine version statement
GlebShikovec Apr 15, 2022
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
2 changes: 1 addition & 1 deletion Plugins/Linter/Linter.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"DocsURL": "http://discord.gamemak.in",
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/ca0639af6339476da86fa3bcf15de8ec",
"SupportURL": "http://discord.gamemak.in",
"EngineVersion": "4.26.0",
"EngineVersion": "5.0",
"CanContainContent": true,
"Installed": true,
"Modules": [
Expand Down
2 changes: 1 addition & 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 @@ -61,7 +61,7 @@ FName ULintRule::GetRuleBasedObjectVariantName_Implementation(UObject* ObjectToL
UMaterialInterface* MI = Cast<UMaterialInterface>(ObjectToLint);
if (MI != nullptr)
{
#if ENGINE_MINOR_VERSION >= 25
#if ENGINE_MINOR_VERSION >= 25 || ENGINE_MAJOR_VERSION >= 5
TMicRecursionGuard RecursionGuard;
#else
UMaterialInterface::TMicRecursionGuard RecursionGuard;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Linter/Source/Linter/Private/LinterContentBrowserExtensions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ void FLinterContentBrowserExtensions::InstallHooks(FLinterModule* LinterModule,
{
lm->SetDesiredLintPaths(SelectedPaths);
}
FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"));
}
FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"));
})),
NAME_None,
EUserInterfaceActionType::Button);
Expand Down
6 changes: 3 additions & 3 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 @@ -83,12 +83,12 @@ void SLintWizard::Construct(const FArguments& InArgs)
.CancelButtonStyle(FEditorStyle::Get(), "FlatButton.Default")
.FinishButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
.ButtonTextStyle(FEditorStyle::Get(), "LargeText")
.ForegroundColor(FEditorStyle::Get().GetSlateColor("WhiteBrush"))
//.ForegroundColor(FEditorStyle::Get().GetSlateColor("WhiteBrush"))
.CanFinish(true)
.FinishButtonText(LOCTEXT("FinishButtonText", "Close"))
.OnFinished_Lambda([&]()
{
FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"))->RequestCloseTab();
FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
})
+ SWizard::Page()
.CanShow_Lambda([&]() { return RuleSets.Num() > 0; })
Expand Down Expand Up @@ -521,7 +521,7 @@ void SLintWizard::Construct(const FArguments& InArgs)
LOCTEXT("ZipTaskShortName", "Zip Project Task"), FEditorStyle::GetBrush(TEXT("MainFrame.CookContent")));
}

FGlobalTabmanager::Get()->InvokeTab(FName("LinterTab"))->RequestCloseTab();
FGlobalTabmanager::Get()->TryInvokeTab(FName("LinterTab"))->RequestCloseTab();
}
return FReply::Handled();
})
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Linter/Source/Linter/Public/LinterSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ class ULinterSettings : public UObject
public:

UPROPERTY(EditAnywhere, config, Category = Settings)
TAssetPtr<ULintRuleSet> DefaultLintRuleSet;
TSoftObjectPtr<ULintRuleSet> DefaultLintRuleSet;

};