Merge pull request HBat11233#1 from davidjo/building4.25

Building4.25

Author: crazytuzi

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/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/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/PythonEditor.cpp

@@ -7,6 +7,9 @@
 #include "PythonEditorStyle.h"
 #include "PythonProjectEditor.h"
 #include "PythonProject.h"
+#if 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,6 +1,13 @@
 // Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
 
 #include "PythonProjectEditor.h"
+
+#if 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"
@@ -13,6 +20,8 @@
 #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;
@@ -209,7 +218,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_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/PythonProjectEditorCommands.cpp

@@ -14,6 +14,19 @@ FPythonProjectEditorCommands::FPythonProjectEditorCommands()
 
 void FPythonProjectEditorCommands::RegisterCommands()
 {
+#if 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,6 +531,8 @@ 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
@@ -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 *);

Source/UnrealEnginePython/Private/Blueprint/UEPyEdGraphPin.cpp

@@ -253,8 +253,15 @@ static int py_ue_edgraphpin_set_sub_category(ue_PyEdGraphPin *self, PyObject *va
 	return -1;
 }
 
+static PyObject *py_ue_edgraphpin_get_direction(ue_PyEdGraphPin *self, void *closure)
+{
+	uint8 direction = self->pin->Direction;
+	return PyLong_FromLong((long)direction);
+}
+
 static PyGetSetDef ue_PyEdGraphPin_getseters[] = {
 	{ (char*)"name", (getter)py_ue_edgraphpin_get_name, NULL, (char *)"", NULL },
+	{ (char*)"direction", (getter)py_ue_edgraphpin_get_direction, NULL, (char *)"", NULL },
 	{ (char*)"category", (getter)py_ue_edgraphpin_get_category, (setter)py_ue_edgraphpin_set_category, (char *)"", NULL },
 	{ (char*)"sub_category", (getter)py_ue_edgraphpin_get_sub_category, (setter)py_ue_edgraphpin_set_sub_category, (char *)"", NULL },
 	{ (char*)"default_value", (getter)py_ue_edgraphpin_get_default_value, (setter)py_ue_edgraphpin_set_default_value, (char *)"", NULL },