Skip to content

Commit 91ab3b2

Browse files
committed
Updated to 4.26
Fixed compile issues
1 parent 39369ec commit 91ab3b2

9 files changed

Lines changed: 10 additions & 9 deletions

File tree

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Plugins/ElgEditorScripting/Binaries/Win64/UE4Editor-Win64-DebugGame.modules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"BuildId": "13144385",
2+
"BuildId": "14830424",
33
"Modules":
44
{
55
"ElgEditorScripting": "UE4Editor-ElgEditorScripting-Win64-DebugGame.dll"

Plugins/ElgEditorScripting/Binaries/Win64/UE4Editor.modules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"BuildId": "13144385",
2+
"BuildId": "14830424",
33
"Modules":
44
{
55
"ElgEditorScripting": "UE4Editor-ElgEditorScripting.dll"

Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_Assets.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,10 @@ void UElgEditorBP_Assets::GetReferenceDependencies(const FAssetData AssetData, c
423423
TArray<FAssetIdentifier> ReferenceNames;
424424

425425
if (bReferencers) {
426-
AssetRegistryModule.Get().GetReferencers(FAssetIdentifier::FAssetIdentifier(AssetData.PackageName), ReferenceNames, (EAssetRegistryDependencyType::Type)ReferenceFlags);
426+
AssetRegistryModule.Get().GetReferencers(AssetData.PackageName, ReferenceNames, UE::AssetRegistry::EDependencyCategory::All);
427427
}
428428
else {
429-
AssetRegistryModule.Get().GetDependencies(FAssetIdentifier::FAssetIdentifier(AssetData.PackageName), ReferenceNames, (EAssetRegistryDependencyType::Type)ReferenceFlags);
429+
AssetRegistryModule.Get().GetDependencies(AssetData.PackageName, ReferenceNames, UE::AssetRegistry::EDependencyCategory::All);
430430
}
431431

432432
// skip ourself in the referencer list
@@ -459,7 +459,8 @@ TArray<FString> UElgEditorBP_Assets::GetSelectedPaths()
459459

460460
FString UElgEditorBP_Assets::AssetPathToDiskPath(const FString& InAssetPath)
461461
{
462-
FAssetData assetData = GetAssetDataFromPath(InAssetPath);
462+
FString path;
463+
static FAssetData assetData = GetAssetDataFromPath(InAssetPath);
463464
return GetAssetDiskPath(assetData);
464465
}
465466

Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,14 +510,14 @@ void UElgEditorContext_LevelEditor::SetViewportRealtime(bool bInRealtime)
510510
void UElgEditorContext_LevelEditor::SetViewportRealtimeOverride(bool bInRealtime, FText SystemDisplayName)
511511
{
512512
if (GCurrentLevelEditingViewportClient == nullptr) return;
513-
GCurrentLevelEditingViewportClient->SetRealtimeOverride(bInRealtime, SystemDisplayName);
513+
GCurrentLevelEditingViewportClient->AddRealtimeOverride(bInRealtime, SystemDisplayName);
514514

515515
}
516516

517-
void UElgEditorContext_LevelEditor::RestoreViewportRealtime()
517+
void UElgEditorContext_LevelEditor::RestoreViewportRealtime(FText SystemDisplayName)
518518
{
519519
if (GCurrentLevelEditingViewportClient == nullptr) return;
520-
GCurrentLevelEditingViewportClient->RemoveRealtimeOverride();
520+
GCurrentLevelEditingViewportClient->RemoveRealtimeOverride(SystemDisplayName);
521521
}
522522

523523
#pragma endregion

Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_LevelEditor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class ELGEDITORSCRIPTING_API UElgEditorContext_LevelEditor : public UObject
423423
/* Removes the current realtime override. If there was another realtime override set it will restore that override
424424
*/
425425
UFUNCTION(BlueprintCallable, Category = "ElgEditor|LevelEditor")
426-
void RestoreViewportRealtime();
426+
void RestoreViewportRealtime(FText SystemDisplayName);
427427

428428

429429
#pragma endregion

0 commit comments

Comments
 (0)