added support for unreal 4.15

Roberto De Ioris · Roberto De Ioris · commit b156c656f86c · 2017-02-10T21:18:24.000+01:00
diff --git a/Source/PythonConsole/Private/PythonConsoleModule.cpp b/Source/PythonConsole/Private/PythonConsoleModule.cpp
@@ -5,6 +5,7 @@
 #include "SPythonLog.h"
 #include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructureModule.h"
 #include "SDockTab.h"
+#include "Editor/WorkspaceMenuStructure/Public/WorkspaceMenuStructure.h"
 
 IMPLEMENT_MODULE( FPythonConsoleModule, PythonLog );
 
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -15,6 +15,9 @@
 #include "Editor/UnrealEd/Public/EditorLevelUtils.h"
 #include "Runtime/Projects/Public/Interfaces/IPluginManager.h"
 #include "ObjectTools.h"
+#include "Developer/AssetTools/Public/IAssetTools.h"
+#include "Editor/ContentBrowser/Public/IContentBrowserSingleton.h"
+#include "Runtime/Engine/Classes/EdGraph/EdGraphPin.h"
 
 
 PyObject *py_unreal_engine_get_editor_world(PyObject * self, PyObject * args) {
@@ -256,7 +259,7 @@ PyObject *py_unreal_engine_import_asset(PyObject * self, PyObject * args) {
 		char * filename = PyString_AsString(PyObject_Str(assetsObject));
 #endif
 		files.Add(UTF8_TO_TCHAR(filename));
-	}
+}
 	else {
 		return PyErr_Format(PyExc_Exception, "Not a string nor valid list of string");
 	}
@@ -964,8 +967,13 @@ PyObject *py_unreal_engine_blueprint_add_member_variable(PyObject * self, PyObje
 	bool is_array = false;
 	if (py_is_array && PyObject_IsTrue(py_is_array))
 		is_array = true;
-
+#if ENGINE_MINOR_VERSION > 14
+	FEdGraphPinType pin;
+	pin.PinCategory = UTF8_TO_TCHAR(in_type);
+	pin.bIsArray = is_array;
+#else
 	FEdGraphPinType pin(UTF8_TO_TCHAR(in_type), FString(""), nullptr, is_array, false);
+#endif
 
 	if (FBlueprintEditorUtils::AddMemberVariable(bp, UTF8_TO_TCHAR(name), pin)) {
 		Py_INCREF(Py_True);
diff --git a/Source/UnrealEnginePython/Private/UEPyFARFilter.h b/Source/UnrealEnginePython/Private/UEPyFARFilter.h
@@ -4,11 +4,12 @@
 #if WITH_EDITOR
 
 #include "AssetRegistryModule.h"
+#include "Runtime/AssetRegistry/Public/ARFilter.h"
 
 typedef struct {
 	PyObject_HEAD
-		/* Type-specific fields go here. */
-		FARFilter filter;
+	/* Type-specific fields go here. */
+	FARFilter filter;
 	PyObject *class_names;
 	PyObject *object_paths;
 	PyObject *package_names;
diff --git a/Source/UnrealEnginePython/UnrealEnginePython.Build.cs b/Source/UnrealEnginePython/UnrealEnginePython.Build.cs
@@ -104,7 +104,9 @@ public UnrealEnginePython(TargetInfo Target)
             }
             System.Console.WriteLine("Using Python at: " + pythonHome);
             PublicIncludePaths.Add(pythonHome);
-            PublicAdditionalLibraries.Add(GetWindowsPythonLibFile(pythonHome));
+            string libPath = GetWindowsPythonLibFile(pythonHome);
+            PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));
+            PublicAdditionalLibraries.Add(libPath);
         }
         else if (Target.Platform == UnrealTargetPlatform.Mac)
         {
@@ -118,7 +120,9 @@ public UnrealEnginePython(TargetInfo Target)
             }
             System.Console.WriteLine("Using Python at: " + pythonHome);
             PublicIncludePaths.Add(pythonHome);
-            PublicDelayLoadDLLs.Add(GetMacPythonLibFile(pythonHome));
+            string libPath = GetMacPythonLibFile(pythonHome);
+            PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));
+            PublicDelayLoadDLLs.Add(libPath);
             Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));
         }
         else if (Target.Platform == UnrealTargetPlatform.Linux)

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,9 @@ public UnrealEnginePython(TargetInfo Target)`
`104`	`104`	`}`
`105`	`105`	`System.Console.WriteLine("Using Python at: " + pythonHome);`
`106`	`106`	`PublicIncludePaths.Add(pythonHome);`
`107`		`- PublicAdditionalLibraries.Add(GetWindowsPythonLibFile(pythonHome));`
	`107`	`+ string libPath = GetWindowsPythonLibFile(pythonHome);`
	`108`	`+ PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));`
	`109`	`+ PublicAdditionalLibraries.Add(libPath);`
`108`	`110`	`}`
`109`	`111`	`else if (Target.Platform == UnrealTargetPlatform.Mac)`
`110`	`112`	`{`
`@@ -118,7 +120,9 @@ public UnrealEnginePython(TargetInfo Target)`
`118`	`120`	`}`
`119`	`121`	`System.Console.WriteLine("Using Python at: " + pythonHome);`
`120`	`122`	`PublicIncludePaths.Add(pythonHome);`
`121`		`- PublicDelayLoadDLLs.Add(GetMacPythonLibFile(pythonHome));`
	`123`	`+ string libPath = GetMacPythonLibFile(pythonHome);`
	`124`	`+ PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));`
	`125`	`+ PublicDelayLoadDLLs.Add(libPath);`
`122`	`126`	`Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));`
`123`	`127`	`}`
`124`	`128`	`else if (Target.Platform == UnrealTargetPlatform.Linux)`