first round for 4.20 sull support

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/Slate/UEPyFSlateStyleSet.cpp

@@ -1,6 +1,8 @@
 
 #include "UEPyFSlateStyleSet.h"
 #include "SlateTypes.h"
+#include "Runtime/SlateCore/Public/Styling/SlateStyleRegistry.h"
+#include "Runtime/SlateCore/Public/Sound/SlateSound.h"
 #include "Map.h"
 
 static PyObject *py_ue_fslate_style_set_set_content_root(ue_PyFSlateStyleSet *self, PyObject * args)

Source/UnrealEnginePython/Private/Slate/UEPySNumericEntryBox.h

@@ -3,7 +3,7 @@
 
 #include "UEPySCompoundWidget.h"
 
-#include "Runtime/Slate/Public/SlateFwd.h"
+#include "Runtime/Slate/Public/Widgets/Input/SNumericEntryBox.h"
 
 extern PyTypeObject ue_PySNumericEntryBoxType;
 

Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp

@@ -108,6 +108,7 @@
 
 #include "Runtime/Core/Public/Misc/Attribute.h"
 #include "Runtime/Slate/Public/Framework/Application/SlateApplication.h"
+#include "Runtime/SlateCore/Public/Styling/SlateStyleRegistry.h"
 
 FReply FPythonSlateDelegate::OnMouseEvent(const FGeometry &geometry, const FPointerEvent &pointer_event)
 {

Source/UnrealEnginePython/Private/Slate/UEPySlate.h

@@ -2,8 +2,7 @@
 
 #include "UEPyModule.h"
 
-#include "SlateBasics.h"
-#include "SlateExtras.h"
+#include "Runtime/SlateCore/Public/Widgets/DeclarativeSyntaxSupport.h"
 
 
 #if WITH_EDITOR

Source/UnrealEnginePython/Private/Slate/UEPySlateDelegate.h

@@ -1,9 +1,6 @@
 #pragma once
 
 
-#include "SlateBasics.h"
-#include "SlateExtras.h"
-
 #include "PythonSmartDelegate.h"
 
 #include "UEPySlatePythonItem.h"

Source/UnrealEnginePython/Private/UEPyAssetUserData.cpp

@@ -23,7 +23,11 @@ PyObject *py_ue_asset_import_data(ue_PyUObject * self, PyObject * args)
 		PyDict_SetItemString(py_source_file, "absolute_filepath", PyUnicode_FromString(TCHAR_TO_UTF8(*import_data->ResolveImportFilename(import_info->SourceFiles[i].RelativeFilename, NULL))));
 		PyDict_SetItemString(py_source_file, "relative_filepath", PyUnicode_FromString(TCHAR_TO_UTF8(*import_info->SourceFiles[i].RelativeFilename)));
 		PyDict_SetItemString(py_source_file, "timestamp", PyLong_FromLong(import_info->SourceFiles[i].Timestamp.ToUnixTimestamp()));
+#if ENGINE_MINOR_VERSION > 19
+		PyDict_SetItemString(py_source_file, "filehash", PyUnicode_FromString(TCHAR_TO_UTF8(*LexToString(import_info->SourceFiles[i].FileHash))));
+#else
 		PyDict_SetItemString(py_source_file, "filehash", PyUnicode_FromString(TCHAR_TO_UTF8(*LexicalConversion::ToString(import_info->SourceFiles[i].FileHash))));
+#endif
 		PyList_SetItem(ret, i, py_source_file);
 	}
 	return ret;

Source/UnrealEnginePython/Private/UObject/UEPyCapture.cpp

@@ -20,6 +20,8 @@ for a queue of UMovieSceneCapture objects
 #include "Slate/UEPySPythonEditorViewport.h"
 #include "GameFramework/GameModeBase.h"
 #include "GameFramework/GameMode.h"
+#include "Runtime/CoreUObject/Public/Serialization/ObjectReader.h"
+#include "Runtime/CoreUObject/Public/Serialization/ObjectWriter.h"
 
 
 struct FInEditorMultiCapture : TSharedFromThis<FInEditorMultiCapture>

Source/UnrealEnginePython/Private/UObject/UEPySequencer.cpp

@@ -732,7 +732,9 @@ PyObject *py_ue_sequencer_section_add_key(ue_PyUObject *self, PyObject * args)
 			PyObject *f_value = PyNumber_Float(py_value);
 			float value = PyFloat_AsDouble(f_value);
 			Py_DECREF(f_value);
+#if ENGINE_MINOR_VERSION < 20
 			section_float->AddKey(time, value, (EMovieSceneKeyInterpolation)interpolation);
+#endif
 			Py_RETURN_NONE;
 		}
 	}
@@ -744,7 +746,9 @@ PyObject *py_ue_sequencer_section_add_key(ue_PyUObject *self, PyObject * args)
 			bool value = false;
 			if (PyObject_IsTrue(py_value))
 				value = true;
+#if ENGINE_MINOR_VERSION < 20
 			section_bool->AddKey(time, value, (EMovieSceneKeyInterpolation)interpolation);
+#endif
 			Py_RETURN_NONE;
 		}
 	}
@@ -756,6 +760,7 @@ PyObject *py_ue_sequencer_section_add_key(ue_PyUObject *self, PyObject * args)
 			bool unwind = (py_unwind && PyObject_IsTrue(py_unwind));
 			FTransform transform = py_transform->transform;
 
+#if ENGINE_MINOR_VERSION < 20
 			FTransformKey tx = FTransformKey(EKey3DTransformChannel::Translation, EAxis::X, transform.GetLocation().X, unwind);
 			FTransformKey ty = FTransformKey(EKey3DTransformChannel::Translation, EAxis::Y, transform.GetLocation().Y, unwind);
 			FTransformKey tz = FTransformKey(EKey3DTransformChannel::Translation, EAxis::Z, transform.GetLocation().Z, unwind);
@@ -777,7 +782,7 @@ PyObject *py_ue_sequencer_section_add_key(ue_PyUObject *self, PyObject * args)
 			section_transform->AddKey(time, sx, (EMovieSceneKeyInterpolation)interpolation);
 			section_transform->AddKey(time, sy, (EMovieSceneKeyInterpolation)interpolation);
 			section_transform->AddKey(time, sz, (EMovieSceneKeyInterpolation)interpolation);
-
+#endif
 			Py_RETURN_NONE;
 		}
 	}
@@ -787,13 +792,16 @@ PyObject *py_ue_sequencer_section_add_key(ue_PyUObject *self, PyObject * args)
 		if (ue_PyFVector *py_vector = py_ue_is_fvector(py_value))
 		{
 			FVector vec = py_vector->vec;
+#if ENGINE_MINOR_VERSION < 20
 			FVectorKey vx = FVectorKey(EKeyVectorChannel::X, vec.X);
 			FVectorKey vy = FVectorKey(EKeyVectorChannel::Y, vec.Y);
 			FVectorKey vz = FVectorKey(EKeyVectorChannel::Z, vec.Z);
 
+
 			section_vector->AddKey(time, vx, (EMovieSceneKeyInterpolation)interpolation);
 			section_vector->AddKey(time, vy, (EMovieSceneKeyInterpolation)interpolation);
 			section_vector->AddKey(time, vz, (EMovieSceneKeyInterpolation)interpolation);
+#endif
 
 			Py_RETURN_NONE;
 		}
@@ -1102,9 +1110,11 @@ PyObject *py_ue_sequencer_import_fbx_transform(ue_PyUObject *self, PyObject * ar
 			{
 				ChannelAxis = EAxis::Z;
 			}
+#if ENGINE_MINOR_VERSION < 20
 			section->GetTranslationCurve(ChannelAxis).SetDefaultValue(DefaultTransform.GetLocation()[ChannelIndex]);
 			section->GetRotationCurve(ChannelAxis).SetDefaultValue(DefaultTransform.GetRotation().Euler()[ChannelIndex]);
 			section->GetScaleCurve(ChannelAxis).SetDefaultValue(DefaultTransform.GetScale3D()[ChannelIndex]);
+#endif
 		}
 #else
 		CurveAPI.GetConvertedTransformCurveData(NodeName, Translation[0], Translation[1], Translation[2], EulerRotation[0], EulerRotation[1], EulerRotation[2], Scale[0], Scale[1], Scale[2]);
@@ -1136,7 +1146,9 @@ PyObject *py_ue_sequencer_import_fbx_transform(ue_PyUObject *self, PyObject * ar
 				if (CurveIndex == 0)
 				{
 					CurveFloat = &Translation[ChannelIndex];
+#if ENGINE_MINOR_VERSION < 20
 					ChannelCurve = &section->GetTranslationCurve(ChannelAxis);
+#endif
 					if (ChannelIndex == 1)
 					{
 						bNegative = true;
@@ -1145,7 +1157,9 @@ PyObject *py_ue_sequencer_import_fbx_transform(ue_PyUObject *self, PyObject * ar
 				else if (CurveIndex == 1)
 				{
 					CurveFloat = &EulerRotation[ChannelIndex];
+#if ENGINE_MINOR_VERSION < 20
 					ChannelCurve = &section->GetRotationCurve(ChannelAxis);
+#endif
 					if (ChannelIndex == 1 || ChannelIndex == 2)
 					{
 						bNegative = true;
@@ -1154,7 +1168,9 @@ PyObject *py_ue_sequencer_import_fbx_transform(ue_PyUObject *self, PyObject * ar
 				else if (CurveIndex == 2)
 				{
 					CurveFloat = &Scale[ChannelIndex];
+#if ENGINE_MINOR_VERSION < 20
 					ChannelCurve = &section->GetScaleCurve(ChannelAxis);
+#endif
 				}
 
 				if (ChannelCurve != nullptr && CurveFloat != nullptr)
@@ -1184,7 +1200,9 @@ PyObject *py_ue_sequencer_import_fbx_transform(ue_PyUObject *self, PyObject * ar
 							LeaveTangent = -LeaveTangent;
 						}
 
+#if ENGINE_MINOR_VERSION < 20
 						FMatineeImportTools::SetOrAddKey(*ChannelCurve, CurveFloat->Points[KeyIndex].InVal, CurveFloat->Points[KeyIndex].OutVal, ArriveTangent, LeaveTangent, CurveFloat->Points[KeyIndex].InterpMode);
+#endif
 					}
 
 					ChannelCurve->RemoveRedundantKeys(KINDA_SMALL_NUMBER);
@@ -1193,8 +1211,10 @@ PyObject *py_ue_sequencer_import_fbx_transform(ue_PyUObject *self, PyObject * ar
 			}
 		}
 
+#if ENGINE_MINOR_VERSION < 20
 		section->SetStartTime(MinTime);
 		section->SetEndTime(MaxTime);
+#endif
 
 		FbxImporter->ReleaseScene();
 		ImportOptions->bConvertScene = bConverteScene;

Source/UnrealEnginePython/Public/UnrealEnginePython.h

@@ -9,9 +9,6 @@
 
 //#define UEPY_MEMORY_DEBUG	1
 
-
-
-
 #include "CoreMinimal.h"
 #include "ModuleManager.h"
 #include "Styling/SlateStyle.h"

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -144,6 +144,7 @@ public UnrealEnginePython(TargetInfo Target)
                 "MovieSceneCapture",
                 "Landscape",
                 "Foliage",
+                "AIModule"
 				// ... add private dependencies that you statically link with here ...
 			}
             );