Skip to content

Update 5.4 #15

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 4 commits into
base: master
Choose a base branch
from
Open

Update 5.4 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62af9ed
Update ElgEditorScripting.uplugin 5.4
zeit-feld Aug 1, 2024
16aa7a8
Update 5.4 ElgEditorBP_UBlueprint.cpp
zeit-feld Aug 1, 2024
940b491
Update 5.4 ElgEditorContext_BP.cpp
zeit-feld Aug 1, 2024
f40c1d3
Update 5.4 ElgEditorContext_LevelEditor.cpp
zeit-feld Aug 1, 2024
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
4 changes: 2 additions & 2 deletions 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": "5.3.0",
"EngineVersion": "5.4",
"CanContainContent": false,
"Installed": true,
"Modules": [
Expand All @@ -20,4 +20,4 @@
"LoadingPhase": "Default"
}
]
}
}
7 changes: 4 additions & 3 deletions ...lgEditorScripting/Source/ElgEditorScripting/Private/Blueprints/ElgEditorBP_UBlueprint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ UBlueprint* UElgEditorBP_UBlueprint::GetBlueprintFromAssetData(const FAssetData&
Branches = EBPEditorOutputValidBranch::Valid;
return blueprint;

#endif

#else
return nullptr;
#endif
}


Expand All @@ -60,10 +60,11 @@ UBlueprint* UElgEditorBP_UBlueprint::GetBlueprintFromObject(UObject* Object, EBP

Branches = EBPEditorOutputValidBranch::Valid;
return blueprint;
#else
return nullptr;

#endif

return nullptr;
}


Expand Down
6 changes: 4 additions & 2 deletions ...gEditorScripting/Source/ElgEditorScripting/Private/EditorContexts/ElgEditorContext_BP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ UElgEditorContext_LevelEditor* UElgEditorContext_BP::GetLevelEditorContext()
#if WITH_EDITOR
const FElgEditorScriptingModule& elgEditorScriptModule = FModuleManager::Get().LoadModuleChecked<FElgEditorScriptingModule>(TEXT("ElgEditorScripting"));
return elgEditorScriptModule.GetContextManager().GetLevelEditorContext();
#endif
#else
return nullptr;
#endif
}


Expand All @@ -31,8 +32,9 @@ UElgEditorContext_AssetBrowser* UElgEditorContext_BP::GetAssetBrowserContext()
#if WITH_EDITOR
const FElgEditorScriptingModule& elgEditorScriptModule = FModuleManager::Get().LoadModuleChecked<FElgEditorScriptingModule>(TEXT("ElgEditorScripting"));
return elgEditorScriptModule.GetContextManager().GetAssetBrowserContext();
#endif
#else
return nullptr;
#endif
}


Expand Down
3 changes: 2 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 @@ -14,6 +14,7 @@
#include "Input/Events.h"
#include <EditorModeManager.h>
#include <EditorModeTools.h>
#include <Engine/HitResult.h>


#pragma region Setup
Expand Down Expand Up @@ -692,4 +693,4 @@ void UElgEditorContext_LevelEditor::GetViewportPerspectiveLocation(FVector& Came
}
}

#pragma endregion
#pragma endregion