Support 4.27 & 5.0.0

.gitattributes

@@ -0,0 +1 @@
+ios/Python/libPython.a filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -4,7 +4,6 @@ __pycache__/
 *$py.class
 
 # C extensions
-*.so
 
 # Distribution / packaging
 .Python
@@ -15,7 +14,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

README.md

@@ -40,7 +40,7 @@ Once the plugin is installed and enabled, you get access to the 'PythonConsole'
 
 All of the exposed engine features are under the 'unreal_engine' virtual module (it is completely coded in c into the plugin, so do not expect to run 'import unreal_engine' from a standard python shell)
 
-The minimal supported Unreal Engine version is 4.12, while the latest is 4.23
+The minimal supported Unreal Engine version is 4.12, while the latest is 4.24
 
 We support official python.org releases as well as IntelPython and Anaconda distributions.
 

Source/PythonAutomation/Public/PythonAutomationModule.h

@@ -3,7 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#if ENGINE_MAJOR_VERSION==4 && ENGINE_MINOR_VERSION>=22
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 22)
 #include "Modules/ModuleInterface.h"
 #else
 #include "ModuleInterface.h"

Source/PythonAutomation/PythonAutomation.Build.cs

@@ -13,8 +13,7 @@ public PythonAutomation(TargetInfo Target)
     {
         PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
         string enableUnityBuild = System.Environment.GetEnvironmentVariable("UEP_ENABLE_UNITY_BUILD");
-        bFasterWithoutUnity = string.IsNullOrEmpty(enableUnityBuild);
-
+        bUseUnity = string.IsNullOrEmpty(enableUnityBuild);
         PrivateIncludePaths.AddRange(
             new string[] {
                 "PythonConsole/Private",

Source/PythonConsole/Private/PyFbxFactory.cpp

@@ -26,7 +26,7 @@ void UPyFbxFactory::PostInitProperties() {
 
 UObject * UPyFbxFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled)
 {
-#if ENGINE_MINOR_VERSION >= 20
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 20)
 	if (ImportUI->MeshTypeToImport == FBXIT_MAX)
 	{
 		if (!DetectImportType(UFactory::CurrentFilename))

Source/PythonConsole/Private/PythonConsoleModule.cpp

@@ -60,7 +60,9 @@ static TSharedPtr<FPythonLogHistory> PythonLogHistory;
 TSharedRef<SDockTab> SpawnPythonLog( const FSpawnTabArgs& Args )
 {
 	return SNew(SDockTab)
+#if ENGINE_MAJOR_VERSION == 4
 		.Icon(FEditorStyle::GetBrush("Log.TabIcon"))
+#endif
 		.TabRole( ETabRole::NomadTab )
 		.Label( NSLOCTEXT("PythonConsole", "TabTitle", "Python Console") )
 		[

Source/PythonConsole/Private/SPythonLog.cpp

@@ -371,7 +371,7 @@ FPythonLogTextLayoutMarshaller::FPythonLogTextLayoutMarshaller(TArray< TSharedPt
 BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
 void SPythonLog::Construct(const FArguments& InArgs)
 {
-#if ENGINE_MINOR_VERSION < 18
+#if !(ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 18))
 	MessagesTextMarshaller = FPythonLogTextLayoutMarshaller::Create(MoveTemp(InArgs._Messages));
 #else
 	MessagesTextMarshaller = FPythonLogTextLayoutMarshaller::Create(InArgs._Messages);

Source/PythonConsole/PythonConsole.Build.cs

@@ -13,7 +13,7 @@ public PythonConsole(TargetInfo Target)
     {
         PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
         string enableUnityBuild = System.Environment.GetEnvironmentVariable("UEP_ENABLE_UNITY_BUILD");
-        bFasterWithoutUnity = string.IsNullOrEmpty(enableUnityBuild);
+        bUseUnity = string.IsNullOrEmpty(enableUnityBuild);
 
         PrivateIncludePaths.AddRange(
             new string[] {

Source/PythonEditor/Private/PYRichTextSyntaxHighlighterTextLayoutMarshaller.cpp

@@ -311,7 +311,7 @@ void FPYRichTextSyntaxHighlighterTextLayoutMarshaller::ParseTokens(const FString
 			FRunInfo RunInfo(TEXT("SyntaxHighlight.PY.Normal"));
 			FTextBlockStyle TextBlockStyle = SyntaxTextStyle.NormalTextStyle;
 
-#if ENGINE_MINOR_VERSION >= 18
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 18)
 			const bool bIsWhitespace = FString(TokenText).TrimEnd().IsEmpty();
 #else
 			const bool bIsWhitespace = FString(TokenText).TrimTrailing().IsEmpty();

Source/PythonEditor/Private/PythonEditor.cpp

@@ -7,6 +7,9 @@
 #include "PythonEditorStyle.h"
 #include "PythonProjectEditor.h"
 #include "PythonProject.h"
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 24)
+#include "Subsystems/AssetEditorSubsystem.h"
+#endif
 #include "Runtime/Slate/Public/Framework/MultiBox/MultiBoxBuilder.h"
 
 static const FName PythonEditorTabName( TEXT( "PythonEditor" ) );
@@ -90,4 +93,4 @@ class FPythonEditor : public IModuleInterface
 
 IMPLEMENT_MODULE( FPythonEditor, PythonEditor )
 
-#undef LOCTEXT_NAMESPACE
+#undef LOCTEXT_NAMESPACE

Source/PythonEditor/Private/PythonProjectEditor.cpp

@@ -1,18 +1,32 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #include "PythonProjectEditor.h"
+
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 24)
+#include "Subsystems/AssetEditorSubsystem.h"
+
+// #include "UnrealEd.h"
+#endif
+
 #include "SPythonEditor.h"
 #include "SPythonProjectEditor.h"
 #include "Runtime/Slate/Public/Widgets/Docking/SDockTab.h"
 #include "PythonProjectEditorToolbar.h"
+#if ENGINE_MAJOR_VERSION == 5
+#include "WorkflowOrientedApp/WorkflowUObjectDocuments.h"
+#include "WorkflowOrientedApp/ApplicationMode.h"
+#else
 #include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowUObjectDocuments.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/ApplicationMode.h"
+#endif
 #include "PythonProjectItem.h"
 #include "PythonEditorStyle.h"
 #include "PythonProject.h"
 #include "PythonProjectEditorCommands.h"
 #include "Runtime/Core/Public/HAL/PlatformFilemanager.h"
 #include "Runtime/Core/Public/Misc/MessageDialog.h"
+
+
 #define LOCTEXT_NAMESPACE "PythonEditor"
 
 TWeakPtr<FPythonProjectEditor> FPythonProjectEditor::PythonEditor;
@@ -153,7 +167,9 @@ FBasicPythonEditorMode::FBasicPythonEditorMode(TSharedPtr<class FPythonProjectEd
 				FTabManager::NewStack()
 				->SetSizeCoefficient(0.1f)
 				->SetHideTabWell(true)
+#if ENGINE_MAJOR_VERSION == 4
 				->AddTab(InPythonEditor->GetToolbarTabId(), ETabState::OpenedTab)
+#endif
 				)
 			->Split
 			(
@@ -209,7 +225,13 @@ void FPythonProjectEditor::RegisterToolbarTab(const TSharedRef<class FTabManager
 
 void FPythonProjectEditor::InitPythonEditor(const EToolkitMode::Type Mode, const TSharedPtr< class IToolkitHost >& InitToolkitHost, class UPythonProject* PythonProject)
 {
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 24)
+	// UAssetEditorSubsystem* AssetEditorSubsystem = GEditor->GetEditorSubsystem<UAssetEditorSubsystem>();
+	// GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->CloseOtherEditors(PythonProject, this);
+	GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->CloseOtherEditors(PythonProject, this);
+#else
 	FAssetEditorManager::Get().CloseOtherEditors(PythonProject, this);
+#endif
 	PythonProjectBeingEdited = PythonProject;
 
 	TSharedPtr<FPythonProjectEditor> ThisPtr(SharedThis(this));

Source/PythonEditor/Private/PythonProjectEditor.h

@@ -2,15 +2,27 @@
 
 #pragma once
 
+#if ENGINE_MAJOR_VERSION == 5
+#include "WorkflowOrientedApp/WorkflowCentricApplication.h"
+#include "WorkflowOrientedApp/WorkflowTabManager.h"
+#else
 #include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowCentricApplication.h"
 #include "Editor/Kismet/Public/WorkflowOrientedApp/WorkflowTabManager.h"
+#endif
 #include "Runtime/Launch/Resources/Version.h"
 
 class FPythonProjectEditor : public FWorkflowCentricApplication, public FGCObject
 {
 public:
 	FPythonProjectEditor();
 
+	// FGCObject interface
+	virtual FString GetReferencerName() const override
+	{
+		return TEXT("FPythonProjectEditor");
+	}
+	// End of FGCObject interface
+
 	// IToolkit interface
 	virtual void RegisterTabSpawners(const TSharedRef<class FTabManager>& TabManager) override;
 	// End of IToolkit interface
@@ -112,7 +124,7 @@ class FPythonProjectEditor : public FWorkflowCentricApplication, public FGCObjec
 	static TWeakPtr<FPythonProjectEditor> PythonEditor;
 
 	virtual bool CanSaveAsset() const override { return false; }
-#if ENGINE_MINOR_VERSION > 17
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 17)
 	virtual bool CanFindInContentBrowser() const override { return false; }
 #endif
 };

Source/PythonEditor/Private/PythonProjectEditorCommands.cpp

@@ -14,6 +14,19 @@ FPythonProjectEditorCommands::FPythonProjectEditorCommands()
 
 void FPythonProjectEditorCommands::RegisterCommands()
 {
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 25)
+	UI_COMMAND(New, "New", "New Python Script.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control, EKeys::N));
+	UI_COMMAND(NewDirectory, "New Directory", "New Directory.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control | EModifierKey::Shift, EKeys::N));
+	UI_COMMAND(Delete, "Delete", "Delete Python Script.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control, EKeys::D));
+
+	UI_COMMAND(Save, "Save", "Save the currently active document.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control, EKeys::S));
+	UI_COMMAND(SaveAll, "Save All", "Save all open documents.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control | EModifierKey::Shift, EKeys::S));
+	UI_COMMAND(Execute, "Execute", "Execute Current Python File.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control, EKeys::Enter));
+#if PLATFORM_MAC
+	UI_COMMAND(ExecuteInMainThread, "Execute In Main Thread", "Execute Current Python File in the Main Thread.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control | EModifierKey::Shift, EKeys::Enter));
+#endif
+	UI_COMMAND(PEP8ize, "PEP8-ize", "Enforce PEP8 to the current code.", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control | EModifierKey::Shift, EKeys::P));
+#else
 	UI_COMMAND(New, "New", "New Python Script.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::N));
 	UI_COMMAND(NewDirectory, "New Directory", "New Directory.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control | EModifierKey::Shift, EKeys::N));
 	UI_COMMAND(Delete, "Delete", "Delete Python Script.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control, EKeys::D));
@@ -25,6 +38,7 @@ void FPythonProjectEditorCommands::RegisterCommands()
 	UI_COMMAND(ExecuteInMainThread, "Execute In Main Thread", "Execute Current Python File in the Main Thread.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control | EModifierKey::Shift, EKeys::Enter));
 #endif
 	UI_COMMAND(PEP8ize, "PEP8-ize", "Enforce PEP8 to the current code.", EUserInterfaceActionType::Button, FInputGesture(EModifierKey::Control | EModifierKey::Shift, EKeys::P));
+#endif
 
 }
 

Source/PythonEditor/PythonEditor.Build.cs

@@ -13,7 +13,7 @@ public PythonEditor(TargetInfo Target)
 
             PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
             string enableUnityBuild = System.Environment.GetEnvironmentVariable("UEP_ENABLE_UNITY_BUILD");
-            bFasterWithoutUnity = string.IsNullOrEmpty(enableUnityBuild);
+            bUseUnity = string.IsNullOrEmpty(enableUnityBuild);
 
             PrivateIncludePaths.AddRange(
                 new string[] {
@@ -32,11 +32,13 @@ public PythonEditor(TargetInfo Target)
                     "UnrealEd",
                     "EditorStyle",
                     "PropertyEditor",
+                    "ContentBrowser",
                     "Kismet",  // for FWorkflowCentricApplication
 					"InputCore",
                     "DirectoryWatcher",
                     "LevelEditor",
                     "Projects",
+                    "Engine",
                     "UnrealEnginePython"
                 }
                 );

Source/UnrealEnginePython/Private/Blueprint/UEPyEdGraph.cpp

@@ -316,6 +316,7 @@ PyObject *py_ue_graph_add_node(ue_PyUObject * self, PyObject * args)
 		{
 			return PyErr_Format(PyExc_Exception, "argument is not a child of UEdGraphNode");
 		}
+		EXTRA_UE_LOG(LogPython, Warning, TEXT("add_node: Casting to class %s"), *u_class->GetName());
 		node = NewObject<UEdGraphNode>(graph, u_class);
 		node->PostLoad();
 	}
@@ -328,6 +329,7 @@ PyObject *py_ue_graph_add_node(ue_PyUObject * self, PyObject * args)
 
 				node->Rename(*node->GetName(), graph);
 		}
+		EXTRA_UE_LOG(LogPython, Warning, TEXT("add_node: renaming node"));
 	}
 
 	if (!node)
@@ -337,8 +339,10 @@ PyObject *py_ue_graph_add_node(ue_PyUObject * self, PyObject * args)
 	node->CreateNewGuid();
 	node->PostPlacedNewNode();
 	node->SetFlags(RF_Transactional);
+	EXTRA_UE_LOG(LogPython, Warning, TEXT("add_node: allocate pins current pins num %d"), node->Pins.Num());
 	if (node->Pins.Num() == 0)
 	{
+		EXTRA_UE_LOG(LogPython, Warning, TEXT("add_node: allocating pins"));
 		node->AllocateDefaultPins();
 	}
 	node->NodePosX = x;
@@ -527,9 +531,11 @@ PyObject *py_ue_graph_add_node_dynamic_cast(ue_PyUObject * self, PyObject * args
 	if(!u_class)
 		return PyErr_Format(PyExc_Exception, "argument is not a UClass");
 
+	EXTRA_UE_LOG(LogPython, Warning, TEXT("add_node_dynamic_cast: Casting to class %s %p"), *u_class->GetName(), (void *)u_class);
+
 	UK2Node_DynamicCast *node = NewObject<UK2Node_DynamicCast>(graph);
 	node->TargetType = u_class;
-#if ENGINE_MINOR_VERSION > 15
+#if ENGINE_MAJOR_VERSION == 5 || (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 15)
 	node->SetPurity(false);
 #endif
 	node->AllocateDefaultPins();
@@ -555,6 +561,8 @@ PyObject *py_ue_graph_add_node_dynamic_cast(ue_PyUObject * self, PyObject * args
 		FBlueprintEditorUtils::MarkBlueprintAsStructurallyModified(bp);
 	}
 
+	EXTRA_UE_LOG(LogPython, Warning, TEXT("add_node_dynamic_cast: targettype is %p"), (void *)(node->TargetType));
+
 	Py_RETURN_UOBJECT(node);
 }
 
@@ -654,6 +662,32 @@ PyObject *py_ue_node_find_pin(ue_PyUObject * self, PyObject * args)
 	return py_ue_new_edgraphpin(pin);
 }
 
+PyObject *py_ue_node_set_purity(ue_PyUObject * self, PyObject * args)
+{
+	ue_py_check(self);
+
+	PyObject *py_bool = nullptr;
+	if (!PyArg_ParseTuple(args, "O:set_purity", &py_bool))
+	{
+		return nullptr;
+	}
+
+	UK2Node_DynamicCast *node = ue_py_check_type<UK2Node_DynamicCast>(self);
+	if (!node)
+		return PyErr_Format(PyExc_Exception, "uobject is not a K2Node_DynamicCast");
+
+	if (PyObject_IsTrue(py_bool))
+	{
+		node->SetPurity(true);
+	}
+	else
+	{
+		node->SetPurity(false);
+	}
+
+	Py_RETURN_NONE;
+}
+
 PyObject *py_ue_node_function_entry_set_pure(ue_PyUObject * self, PyObject * args)
 {
 

Source/UnrealEnginePython/Private/Blueprint/UEPyEdGraph.h

@@ -28,6 +28,8 @@ PyObject *py_ue_node_create_pin(ue_PyUObject *, PyObject *);
 PyObject *py_ue_node_pin_type_changed(ue_PyUObject *, PyObject *);
 PyObject *py_ue_node_pin_default_value_changed(ue_PyUObject *, PyObject *);
 
+PyObject *py_ue_node_set_purity(ue_PyUObject *, PyObject *);
+
 PyObject *py_ue_node_function_entry_set_pure(ue_PyUObject *, PyObject *);
 
 PyObject *py_ue_node_get_title(ue_PyUObject *, PyObject *);