From 62af9ed5cb7b3c0475762c93fbfd11bf6459ec7e Mon Sep 17 00:00:00 2001 From: zeit-feld <112067984+zeit-feld@users.noreply.github.com> Date: Thu, 1 Aug 2024 20:54:19 +0200 Subject: [PATCH 1/4] Update ElgEditorScripting.uplugin 5.4 --- Plugins/ElgEditorScripting/ElgEditorScripting.uplugin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/ElgEditorScripting/ElgEditorScripting.uplugin b/Plugins/ElgEditorScripting/ElgEditorScripting.uplugin index 52cca07..948eb35 100644 --- a/Plugins/ElgEditorScripting/ElgEditorScripting.uplugin +++ b/Plugins/ElgEditorScripting/ElgEditorScripting.uplugin @@ -10,7 +10,7 @@ "DocsURL": "ElgSoft.com", "MarketplaceURL": "", "SupportURL": "mailto:EditorScripting@ElgSoft.com", - "EngineVersion": "5.3.0", + "EngineVersion": "5.4", "CanContainContent": false, "Installed": true, "Modules": [ @@ -20,4 +20,4 @@ "LoadingPhase": "Default" } ] -} \ No newline at end of file +} From 16aa7a846c644abe6d8e6326d8082cf329a449e9 Mon Sep 17 00:00:00 2001 From: zeit-feld <112067984+zeit-feld@users.noreply.github.com> Date: Thu, 1 Aug 2024 20:55:49 +0200 Subject: [PATCH 2/4] Update 5.4 ElgEditorBP_UBlueprint.cpp --- .../Private/Blueprints/ElgEditorBP_UBlueprint.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_UBlueprint.cpp b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_UBlueprint.cpp index dab5e02..5fe2255 100644 --- a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_UBlueprint.cpp +++ b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_UBlueprint.cpp @@ -40,9 +40,9 @@ UBlueprint* UElgEditorBP_UBlueprint::GetBlueprintFromAssetData(const FAssetData& Branches = EBPEditorOutputValidBranch::Valid; return blueprint; -#endif - +#else return nullptr; +#endif } @@ -60,10 +60,11 @@ UBlueprint* UElgEditorBP_UBlueprint::GetBlueprintFromObject(UObject* Object, EBP Branches = EBPEditorOutputValidBranch::Valid; return blueprint; +#else + return nullptr; #endif - return nullptr; } From 940b4913fe99a1541746a4fde8e7423e578fe202 Mon Sep 17 00:00:00 2001 From: zeit-feld <112067984+zeit-feld@users.noreply.github.com> Date: Thu, 1 Aug 2024 20:57:11 +0200 Subject: [PATCH 3/4] Update 5.4 ElgEditorContext_BP.cpp --- .../Private/EditorContexts/ElgEditorContext_BP.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_BP.cpp b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_BP.cpp index 4af3bbf..d26f6b6 100644 --- a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_BP.cpp +++ b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_BP.cpp @@ -21,8 +21,9 @@ UElgEditorContext_LevelEditor* UElgEditorContext_BP::GetLevelEditorContext() #if WITH_EDITOR const FElgEditorScriptingModule& elgEditorScriptModule = FModuleManager::Get().LoadModuleChecked(TEXT("ElgEditorScripting")); return elgEditorScriptModule.GetContextManager().GetLevelEditorContext(); -#endif +#else return nullptr; +#endif } @@ -31,8 +32,9 @@ UElgEditorContext_AssetBrowser* UElgEditorContext_BP::GetAssetBrowserContext() #if WITH_EDITOR const FElgEditorScriptingModule& elgEditorScriptModule = FModuleManager::Get().LoadModuleChecked(TEXT("ElgEditorScripting")); return elgEditorScriptModule.GetContextManager().GetAssetBrowserContext(); -#endif +#else return nullptr; +#endif } From f40c1d3c150c2dc95df815d71d83ec6bf714d227 Mon Sep 17 00:00:00 2001 From: zeit-feld <112067984+zeit-feld@users.noreply.github.com> Date: Thu, 1 Aug 2024 20:58:20 +0200 Subject: [PATCH 4/4] Update 5.4 ElgEditorContext_LevelEditor.cpp --- .../Private/EditorContexts/ElgEditorContext_LevelEditor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp index affee8b..eeda582 100644 --- a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp +++ b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp @@ -14,6 +14,7 @@ #include "Input/Events.h" #include #include +#include #pragma region Setup @@ -692,4 +693,4 @@ void UElgEditorContext_LevelEditor::GetViewportPerspectiveLocation(FVector& Came } } -#pragma endregion \ No newline at end of file +#pragma endregion