Skip to content

Dev #7

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dev #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55b6cc5
Update version for uplugin to 5.0.0
mrbindraw Apr 8, 2022
a111620
Fixed compile warnings for plugin after migration to UE 5.0.0
mrbindraw Apr 8, 2022
0cc7541
Fixed compile errors for plugin after migration to UE 5.0.0
mrbindraw Apr 8, 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/ElgEditorScripting/ElgEditorScripting.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"DocsURL": "ElgSoft.com",
"MarketplaceURL": "",
"SupportURL": "mailto:[email protected]",
"EngineVersion": "4.27.0",
"EngineVersion": "5.0.0",
"CanContainContent": false,
"Installed": true,
"Modules": [
Expand Down
4 changes: 2 additions & 2 deletions ...ditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_PluginManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
15 changes: 14 additions & 1 deletion ...ripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_LevelEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions ...EditorScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ...orScripting/Source/ElgEditorScripting/Public/EditorContexts/ElgEditorContext_DirWatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,31 @@ 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<FString> Directories);

#pragma endregion

#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<FString> Directories);

#pragma endregion

#pragma region Get

/* Return all Directories that are watched */
UFUNCTION(BlueprintPure)
UFUNCTION(BlueprintPure, Category = "ElgEditor|DirWatcher")
TArray<FString> GetWatchDirectories();

#pragma endregion
Expand Down