more 4.20 fixes

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UObject/UEPyCapture.cpp

@@ -344,10 +344,10 @@ PyObject *py_unreal_engine_in_editor_capture(PyObject * self, PyObject * args)
 	}
 
 	Py_BEGIN_ALLOW_THREADS
-	FInEditorMultiCapture::CreateInEditorMultiCapture(Captures);
+		FInEditorMultiCapture::CreateInEditorMultiCapture(Captures);
 	Py_END_ALLOW_THREADS
 
-	Py_RETURN_NONE;
+		Py_RETURN_NONE;
 }
 
 PyObject *py_ue_set_level_sequence_asset(ue_PyUObject *self, PyObject *args)
@@ -371,8 +371,11 @@ PyObject *py_ue_set_level_sequence_asset(ue_PyUObject *self, PyObject *args)
 	if (!capture)
 		return PyErr_Format(PyExc_Exception, "uobject is not a UAutomatedLevelSequenceCapture");
 
+#if ENGINE_MINOR_VERSION < 20
 	capture->SetLevelSequenceAsset(sequence->GetPathName());
-
+#else
+	capture->LevelSequenceAsset = FSoftObjectPath(sequence->GetPathName());
+#endif
 	Py_RETURN_NONE;
 }
 #endif

Source/UnrealEnginePython/Private/UObject/UEPyNavigation.cpp

@@ -1,6 +1,10 @@
 #include "UEPyNavigation.h"
 
+#if ENGINE_MINOR_VERSION < 20
 #include "AI/Navigation/NavigationSystem.h"
+#else
+#include "Blueprint/AIBlueprintHelperLibrary.h"
+#endif
 #include "GameFramework/Pawn.h"
 #include "Engine/World.h"
 
@@ -43,9 +47,12 @@ PyObject *py_ue_simple_move_to_location(ue_PyUObject *self, PyObject * args)
 	if (!controller)
 		return PyErr_Format(PyExc_Exception, "Pawn has no controller");
 
+#if ENGINE_MINOR_VERSION < 20
 	world->GetNavigationSystem()->SimpleMoveToLocation(controller, vec);
+#else
+	UAIBlueprintHelperLibrary::SimpleMoveToLocation(controller, vec);
+#endif
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 

Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp

@@ -729,8 +729,11 @@ PyObject *py_ue_set_property_flags(ue_PyUObject *self, PyObject * args)
 	if (!u_property)
 		return PyErr_Format(PyExc_Exception, "unable to find property %s", property_name);
 
-
+#if ENGINE_MINOR_VERSION < 20
 	u_property->SetPropertyFlags(flags);
+#else
+	u_property->SetPropertyFlags((EPropertyFlags)flags);
+#endif
 	Py_RETURN_NONE;
 }
 
@@ -762,7 +765,11 @@ PyObject *py_ue_add_property_flags(ue_PyUObject *self, PyObject * args)
 		return PyErr_Format(PyExc_Exception, "unable to find property %s", property_name);
 
 
+#if ENGINE_MINOR_VERSION < 20
 	u_property->SetPropertyFlags(u_property->GetPropertyFlags() | flags);
+#else
+	u_property->SetPropertyFlags(u_property->GetPropertyFlags() | (EPropertyFlags)flags);
+#endif
 	Py_RETURN_NONE;
 }
 
@@ -1503,7 +1510,11 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args)
 	{
 		UArrayProperty *u_array = (UArrayProperty *)scope;
 		u_array->AddCppProperty(u_property);
+#if ENGINE_MINOR_VERSION < 20
 		u_property->SetPropertyFlags(flags);
+#else
+		u_property->SetPropertyFlags((EPropertyFlags)flags);
+#endif
 		if (u_property->GetClass() == UObjectProperty::StaticClass())
 		{
 			UObjectProperty *obj_prop = (UObjectProperty *)u_property;
@@ -1628,7 +1639,11 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args)
 		}
 	}
 
+#if ENGINE_MINOR_VERSION < 20
 	u_property->SetPropertyFlags(flags);
+#else
+	u_property->SetPropertyFlags((EPropertyFlags)flags);
+#endif
 	u_property->ArrayDim = 1;
 
 	UStruct *u_struct = (UStruct *)self->ue_object;

Source/UnrealEnginePython/Private/UObject/UEPySequencer.cpp

@@ -13,13 +13,16 @@
 #include "Editor/UnrealEd/Public/Toolkits/AssetEditorManager.h"
 #include "Private/LevelSequenceEditorToolkit.h"
 #include "Tracks/MovieSceneCameraCutTrack.h"
+#if ENGINE_MINOR_VERSION < 20
 #include "Sections/IKeyframeSection.h"
+#endif
 #include "Sections/MovieSceneFloatSection.h"
 #include "Sections/MovieSceneBoolSection.h"
 #include "Sections/MovieScene3DTransformSection.h"
 #include "Sections/MovieSceneVectorSection.h"
 #include "Runtime/MovieScene/Public/MovieSceneFolder.h"
 #include "Runtime/MovieScene/Public/MovieSceneSpawnable.h"
+#include "Runtime/MovieScene/Public/MovieScenePossessable.h"
 #if ENGINE_MINOR_VERSION < 18
 #include "Editor/UnrealEd/Private/FbxImporter.h"
 #else

Source/UnrealEnginePython/Private/Wrappers/UEPyFARFilter.cpp

@@ -330,7 +330,11 @@ void py_ue_sync_farfilter(PyObject *pyobj)
 		for (int i = 0; i < (int)pyset_len; i++)
 		{
 			py_item = PyList_GetItem(pyset, i);
+#if ENGINE_MINOR_VERSION < 20
 			pyfilter->filter.TagsAndValues.AddUnique(ukey, UTF8_TO_TCHAR(PyUnicode_AsUTF8(py_item)));
+#else
+			pyfilter->filter.TagsAndValues.AddUnique(ukey, FString(UTF8_TO_TCHAR(PyUnicode_AsUTF8(py_item))));
+#endif
 		}
 	}
 }