From 55b6cc5ea38d1d57115dadb3131fe6e82c67dd4b Mon Sep 17 00:00:00 2001 From: Andrew Bindraw Date: Fri, 8 Apr 2022 09:45:28 +0300 Subject: [PATCH 1/3] Update version for uplugin to 5.0.0 --- Plugins/ElgEditorScripting/ElgEditorScripting.uplugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/ElgEditorScripting/ElgEditorScripting.uplugin b/Plugins/ElgEditorScripting/ElgEditorScripting.uplugin index b5b8c6a..3b08545 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": "4.27.0", + "EngineVersion": "5.0.0", "CanContainContent": false, "Installed": true, "Modules": [ From a1116204f7767237f4d8a408dfd23ee0d01cb30a Mon Sep 17 00:00:00 2001 From: Andrew Bindraw Date: Fri, 8 Apr 2022 09:48:47 +0300 Subject: [PATCH 2/3] Fixed compile warnings for plugin after migration to UE 5.0.0 --- .../Blueprints/ElgEditorBP_PluginManager.cpp | 4 ++-- .../ElgEditorContext_LevelEditor.cpp | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_PluginManager.cpp b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_PluginManager.cpp index 9aa155d..e76e0d6 100644 --- a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_PluginManager.cpp +++ b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_PluginManager.cpp @@ -396,9 +396,9 @@ UTexture2D* UElgEditorBP_PluginManager::GetTextureByPath(const FString IconPath) if (!texture) return NULL; - void* textureData = texture->PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE); + void* textureData = texture->GetPlatformData()->Mips[0].BulkData.Lock(LOCK_READ_WRITE); FMemory::Memcpy(textureData, uncompressedBGRA.GetData(), uncompressedBGRA.Num()); - texture->PlatformData->Mips[0].BulkData.Unlock(); + texture->GetPlatformData()->Mips[0].BulkData.Unlock(); texture->UpdateResource(); } diff --git a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp index 92453d0..40a2f17 100644 --- a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp +++ b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp @@ -95,9 +95,22 @@ void UElgEditorContext_LevelEditor::Setup() FEditorDelegates::OnFocusViewportOnActors.AddUObject(this, &UElgEditorContext_LevelEditor::HandleOnFocusViewportOnActors); + /* + * REMARK: EditorModeIDEnter, EditorModeIDExit still used in UE 5.0.0 and warning disabled in sources: + Engine/Source/Editor/UnrealEd/Private/EdMode.cpp void FEdMode::Enter(), line 213 + Engine/Source/Editor/UnrealEd/Private/Tools/UEdMode.cpp void FEdMode::Enter(), line 89 + Engine/Source/Editor/UnrealEd/Private/EdMode.cpp void FEdMode::Exit(), line 220 + Engine/Source/Editor/UnrealEd/Private/Tools/UEdMode.cpp void FEdMode::Exit(), line 171 + Engine/Source/Developer/AssetTools/Private/AssetTypeActions/AssetTypeActions_CameraAnim.cpp + void FAssetTypeActions_CameraAnim::OpenAssetEditor, line 183, 224 + void FAssetTypeActions_CameraAnim::OnMatineeEditorClosed line 259 + */ + + PRAGMA_DISABLE_DEPRECATION_WARNINGS FEditorDelegates::EditorModeIDEnter.AddUObject(this, &UElgEditorContext_LevelEditor::HandleEditorModeEnter); FEditorDelegates::EditorModeIDExit.AddUObject(this, &UElgEditorContext_LevelEditor::HandleEditorModeExit); - + PRAGMA_ENABLE_DEPRECATION_WARNINGS + FSlateApplication::Get().OnApplicationMousePreInputButtonDownListener().AddUObject(this, &UElgEditorContext_LevelEditor::HandleOnApplicationMousePreInputButtonDown); FSlateApplication::Get().OnApplicationPreInputKeyDownListener().AddUObject(this, &UElgEditorContext_LevelEditor::HandleOnApplicationPreInputKeyDown); From 0cc75416373ad6964144a547ffee985a38dbf878 Mon Sep 17 00:00:00 2001 From: Andrew Bindraw Date: Fri, 8 Apr 2022 09:50:03 +0300 Subject: [PATCH 3/3] Fixed compile errors for plugin after migration to UE 5.0.0 --- .../Public/EditorContexts/ElgEditorContext_Config.h | 6 +++--- .../EditorContexts/ElgEditorContext_DirWatcher.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_Config.h b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_Config.h index 9473877..96e2290 100644 --- a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_Config.h +++ b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_Config.h @@ -25,13 +25,13 @@ class ELGEDITORSCRIPTING_API UElgEditorContext_Config : public UObject #pragma region Property - UPROPERTY(BlueprintReadOnly) + UPROPERTY(BlueprintReadOnly, Category = "ElgEditor|Config") FString Name; - UPROPERTY(BlueprintReadOnly) + UPROPERTY(BlueprintReadOnly, Category = "ElgEditor|Config") FString Section; - UPROPERTY(BlueprintReadOnly) + UPROPERTY(BlueprintReadOnly, Category = "ElgEditor|Config") FString Path; #pragma endregion diff --git a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_DirWatcher.h b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_DirWatcher.h index 426c5d1..a9c659f 100644 --- a/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_DirWatcher.h +++ b/Plugins/ElgEditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_DirWatcher.h @@ -50,11 +50,11 @@ class ELGEDITORSCRIPTING_API UElgEditorContext_DirWatcher : public UObject #pragma region AddDirs /* Add the Directory to be watched */ - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "ElgEditor|DirWatcher") void AddWatchDirectory(const FString Directory); /* Add the Directories to be watched */ - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "ElgEditor|DirWatcher") void AddWatchDirectories(const TArray Directories); #pragma endregion @@ -62,11 +62,11 @@ class ELGEDITORSCRIPTING_API UElgEditorContext_DirWatcher : public UObject #pragma region RemoveDirs /* Remove the watch for Directory */ - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "ElgEditor|DirWatcher") void RemoveWatchDirectory(const FString Directory); /* Remove the watch for the Directories */ - UFUNCTION(BlueprintCallable) + UFUNCTION(BlueprintCallable, Category = "ElgEditor|DirWatcher") void RemoveWatchDirectories(const TArray Directories); #pragma endregion @@ -74,7 +74,7 @@ class ELGEDITORSCRIPTING_API UElgEditorContext_DirWatcher : public UObject #pragma region Get /* Return all Directories that are watched */ - UFUNCTION(BlueprintPure) + UFUNCTION(BlueprintPure, Category = "ElgEditor|DirWatcher") TArray GetWatchDirectories(); #pragma endregion