preliminary support for 4.22

Author: rdeioris

Source/UnrealEnginePython/Private/Slate/UEPySImage.h

@@ -5,7 +5,11 @@
 
 #include "UEPySLeafWidget.h"
 
+#if ENGINE_MINOR_VERSION > 21
+#include "Runtime/SlateCore/Public/Widgets/Images/SImage.h"
+#else
 #include "Runtime/Slate/Public/Widgets/Images/SImage.h"
+#endif
 #include "Runtime/SlateCore/Public/Styling/SlateBrush.h"
 
 extern PyTypeObject ue_PySImageType;

Source/UnrealEnginePython/Private/UEPyEditor.cpp

@@ -286,7 +286,7 @@ PyObject *py_unreal_engine_editor_play(PyObject * self, PyObject * args)
 	Py_END_ALLOW_THREADS;
 
 	Py_RETURN_NONE;
-	}
+}
 
 PyObject *py_unreal_engine_editor_select_actor(PyObject * self, PyObject * args)
 {
@@ -462,7 +462,7 @@ PyObject *py_unreal_engine_import_asset(PyObject * self, PyObject * args)
 	}
 
 	Py_RETURN_NONE;
-	}
+}
 
 PyObject *py_unreal_engine_editor_tick(PyObject * self, PyObject * args)
 {
@@ -796,7 +796,7 @@ PyObject *py_unreal_engine_rename_asset(PyObject * self, PyObject * args)
 #endif
 
 	Py_RETURN_NONE;
-	}
+}
 
 PyObject *py_unreal_engine_duplicate_asset(PyObject * self, PyObject * args)
 {
@@ -1879,7 +1879,11 @@ PyObject *py_unreal_engine_editor_on_asset_post_import(PyObject * self, PyObject
 		return PyErr_Format(PyExc_Exception, "object is not a callable");
 
 	TSharedRef<FPythonSmartDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewPythonSmartDelegate(py_callable);
+#if ENGINE_MINOR_VERSION > 21
+	GEditor->GetEditorSubsystem<UImportSubsystem>()->OnAssetPostImport.AddSP(py_delegate, &FPythonSmartDelegate::PyFOnAssetPostImport);
+#else
 	FEditorDelegates::OnAssetPostImport.AddSP(py_delegate, &FPythonSmartDelegate::PyFOnAssetPostImport);
+#endif
 	Py_RETURN_NONE;
 }
 
@@ -2115,7 +2119,7 @@ PyObject *py_unreal_engine_add_level_to_world(PyObject *self, PyObject * args)
 #endif
 
 	Py_RETURN_UOBJECT(level_streaming);
-	}
+}
 
 PyObject *py_unreal_engine_move_selected_actors_to_level(PyObject *self, PyObject * args)
 {
@@ -2533,7 +2537,11 @@ PyObject *py_unreal_engine_unregister_settings(PyObject * self, PyObject * args)
 
 PyObject *py_unreal_engine_all_viewport_clients(PyObject * self, PyObject * args)
 {
+#if ENGINE_MINOR_VERSION > 21
+	TArray<FEditorViewportClient *> clients = GEditor->GetAllViewportClients();
+#else
 	TArray<FEditorViewportClient *> clients = GEditor->AllViewportClients;
+#endif
 	PyObject *py_list = PyList_New(0);
 	for (FEditorViewportClient *client : clients)
 	{
@@ -2647,5 +2655,6 @@ PyObject *py_unreal_engine_export_assets(PyObject * self, PyObject * args)
 
 	Py_RETURN_NONE;
 }
+
 #endif
 

Source/UnrealEnginePython/Private/UObject/UEPyLandscape.cpp

@@ -85,10 +85,14 @@ PyObject *py_ue_landscape_export_to_raw_mesh(ue_PyUObject *self, PyObject * args
 	if (!landscape)
 		return PyErr_Format(PyExc_Exception, "uobject is not a ULandscapeProxy");
 
+#if ENGINE_MINOR_VERSION > 21
+	return PyErr_Format(PyExc_Exception, "MeshDescription struct is still unsupported");;
+#else
 	FRawMesh raw_mesh;
 	if (!landscape->ExportToRawMesh(lod, raw_mesh))
 		return PyErr_Format(PyExc_Exception, "unable to export landscape to FRawMesh");
 
 	return py_ue_new_fraw_mesh(raw_mesh);
+#endif
 }
 #endif

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -100,15 +100,13 @@ public UnrealEnginePython(TargetInfo Target)
 
         PublicIncludePaths.AddRange(
             new string[] {
-                "UnrealEnginePython/Public",
 				// ... add public include paths required here ...
             }
             );
 
 
         PrivateIncludePaths.AddRange(
             new string[] {
-                "UnrealEnginePython/Private",
 				// ... add other private include paths required here ...
 			}
             );