Skip to content

Commit 560f0f1

Browse files
committed
Fix 5.7 Compile issues
1 parent 22fbb7d commit 560f0f1

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

Source/Linter/Private/LintRules/LintRule_StaticMesh_ValidUVs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ bool ULintRule_StaticMesh_ValidUVs::PassesRule_Internal_Implementation(UObject*
3434
}
3535

3636
if (BadUVs.Num() > 0) {
37-
const FText RecommendedAction = NSLOCTEXT("Linter", "LintRule_StaticMesh_ValidUVs_Bad", "Static mesh has invalid UVs. [{0}]");
38-
FText::FormatOrdered(RecommendedAction, FText::FromString(FString::Join(BadUVs, TEXT(", "))));
37+
FText RecommendedAction = NSLOCTEXT("Linter", "LintRule_StaticMesh_ValidUVs_Bad", "Static mesh has invalid UVs. [{0}]");
38+
RecommendedAction = FText::FormatOrdered(RecommendedAction, FText::FromString(FString::Join(BadUVs, TEXT(", "))));
3939
OutRuleViolations.Push(FLintRuleViolation(ObjectToLint, GetClass(), RecommendedAction));
4040
return false;
4141
}

Source/Linter/Private/UI/LintWizard.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,11 @@ bool SLintWizard::LoadAssetsIfNeeded(const TArray<FString>& ObjectPaths, TArray<
662662
FScopedSlowTask SlowTask(UnloadedObjectPaths.Num(), LOCTEXT("LoadingObjects", "Loading Objects..."));
663663
SlowTask.MakeDialog();
664664

665+
#if ENGINE_MINOR_VERSION >= 5
666+
UE::SetIsEditorLoadingPackage(true);
667+
#else
665668
GIsEditorLoadingPackage = true;
669+
#endif
666670

667671
constexpr ELoadFlags LoadFlags = LOAD_None;
668672
bool bSomeObjectsFailedToLoad = false;
@@ -685,7 +689,12 @@ bool SLintWizard::LoadAssetsIfNeeded(const TArray<FString>& ObjectPaths, TArray<
685689
break;
686690
}
687691
}
692+
693+
#if ENGINE_MINOR_VERSION >= 5
694+
UE::SetIsEditorLoadingPackage(false);
695+
#else
688696
GIsEditorLoadingPackage = false;
697+
#endif
689698

690699
if (bSomeObjectsFailedToLoad) {
691700
return false;

0 commit comments

Comments
 (0)