Slate sequencer upgrade pr

Source/PythonConsole/Private/PythonScriptFactory.cpp

@@ -5,8 +5,6 @@
 
 UPythonScriptFactory::UPythonScriptFactory(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) {
 
-	Formats.Add(FString("py;Python Script"));
-
 	bCreateNew = false;
 	bEditAfterNew = true;
 

Source/UnrealEnginePython/Private/ConsoleManager/UEPyIConsoleManager.cpp

@@ -560,7 +560,7 @@ static PyObject *py_ue_iconsole_manager_register_command(PyObject *cls, PyObject
 		return PyErr_Format(PyExc_Exception, "console object \"%s\" already exists", key);
 	}
 
-	TSharedRef<FPythonSmartConsoleDelegate> py_delegate = MakeShareable(new FPythonSmartConsoleDelegate);
+	TSharedRef<FPythonSmartConsoleDelegate> py_delegate = MakeShared<FPythonSmartConsoleDelegate>();
 	py_delegate->SetPyCallable(py_callable);
 	FConsoleCommandWithArgsDelegate console_delegate;
 	console_delegate.BindSP(py_delegate, &FPythonSmartConsoleDelegate::OnConsoleCommand);

Source/UnrealEnginePython/Private/Fbx/UEPyFbxObject.cpp

@@ -1,9 +1,6 @@
-
-#include "UEPyFbxObject.h"
-
 #if ENGINE_MINOR_VERSION > 12
 #if WITH_EDITOR
-
+#include "UEPyFbxObject.h"
 #include "UEPyFbx.h"
 
 #include "Runtime/Engine/Classes/Curves/RichCurve.h"
@@ -238,8 +235,8 @@ static PyObject *py_ue_fbx_object_key_get_tangent_mode(ue_PyFbxObject *self, PyO
 
 	ERichCurveTangentMode Mode = RCTM_Auto;
 	// Convert the interpolation type from FBX to Unreal.
-	if (fbx_anim_curve->KeyGetInterpolation(index) ==
-		FbxAnimCurveDef::eInterpolationCubic)
+	if ( fbx_anim_curve->KeyGetInterpolation(index) == 
+		FbxAnimCurveDef::eInterpolationCubic )
 	{
 		switch (fbx_anim_curve->KeyGetTangentMode(index))
 		{

Source/UnrealEnginePython/Private/Fbx/UEPyFbxProperty.cpp

@@ -18,6 +18,14 @@ static PyObject *py_ue_fbx_property_get_string(ue_PyFbxProperty *self, PyObject
     return PyUnicode_FromString(self->fbx_property.Get<FbxString>());
 }
 
+static PyObject *py_ue_fbx_property_get_bool(ue_PyFbxProperty *self, PyObject *args) {
+    return self->fbx_property.Get<FbxBool>() ? Py_True : Py_False;
+}
+
+static PyObject *py_ue_fbx_property_get_int(ue_PyFbxProperty *self, PyObject *args) {
+    return PyLong_FromLong(self->fbx_property.Get<FbxInt>());
+}
+
 static PyObject *py_ue_fbx_property_is_valid(ue_PyFbxProperty *self, PyObject *args) {
 	if (self->fbx_property.IsValid()) {
 		Py_RETURN_TRUE;
@@ -49,6 +57,8 @@ static PyMethodDef ue_PyFbxProperty_methods[] = {
 	{ "get_name", (PyCFunction)py_ue_fbx_property_get_name, METH_VARARGS, "" },
 	{ "get_double3", (PyCFunction)py_ue_fbx_property_get_double3, METH_VARARGS, "" },
     { "get_string", (PyCFunction)py_ue_fbx_property_get_string, METH_VARARGS, "" },
+    { "get_bool", (PyCFunction)py_ue_fbx_property_get_bool, METH_VARARGS, "" },
+    { "get_int", (PyCFunction)py_ue_fbx_property_get_int, METH_VARARGS, "" },
 	{ "is_valid", (PyCFunction)py_ue_fbx_property_is_valid, METH_VARARGS, "" },
 	{ "get_curve_node", (PyCFunction)py_ue_fbx_property_get_curve_node, METH_VARARGS, "" },
 	{ NULL }  /* Sentinel */

Source/UnrealEnginePython/Private/PythonBlueprintFunctionLibrary.cpp

@@ -1,6 +1,7 @@
 
 
 #include "PythonBlueprintFunctionLibrary.h"
+#include "UEPyModule.h"
 
 void UPythonBlueprintFunctionLibrary::ExecutePythonScript(FString script)
 {

Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp

@@ -23,8 +23,7 @@ static PyObject *py_ue_fmenu_builder_end_section(ue_PyFMenuBuilder *self, PyObje
 
 static PyObject *py_ue_fmenu_builder_make_widget(ue_PyFMenuBuilder *self, PyObject * args)
 {
-	ue_PySWidget *ret = (ue_PySWidget *)PyObject_New(ue_PySWidget, &ue_PySWidgetType);
-	new (&ret->Widget) TSharedRef<SWidget>(self->menu_builder.MakeWidget());
+    ue_PySWidget *ret = py_ue_new_swidget<ue_PySWidget>(self->menu_builder.MakeWidget(), &ue_PySWidgetType);
 	return (PyObject *)ret;
 }
 
@@ -34,8 +33,8 @@ static PyObject *py_ue_fmenu_builder_add_menu_entry(ue_PyFMenuBuilder *self, PyO
 	char *tooltip;
 	PyObject *py_callable;
 	PyObject *py_obj = nullptr;
-	PyObject *py_uiaction_obj = nullptr;
-	if (!PyArg_ParseTuple(args, "ssO|OO:add_menu_entry", &label, &tooltip, &py_callable, &py_obj, &py_uiaction_obj))
+	int ui_action_type = EUserInterfaceActionType::Button;
+	if (!PyArg_ParseTuple(args, "ssO|Oi:add_menu_entry", &label, &tooltip, &py_callable, &py_obj, &ui_action_type))
 		return nullptr;
 
 	if (!PyCalllable_Check_Extended(py_callable))
@@ -57,9 +56,8 @@ static PyObject *py_ue_fmenu_builder_add_menu_entry(ue_PyFMenuBuilder *self, PyO
 		handler.BindSP(py_delegate, &FPythonSlateDelegate::SimpleExecuteAction);
 	}
 
-	ue_PyESlateEnums *py_uiaction_enum = py_uiaction_obj ? py_ue_is_eslate_enums(py_uiaction_obj) : nullptr;
 	self->menu_builder.AddMenuEntry(FText::FromString(UTF8_TO_TCHAR(label)), FText::FromString(UTF8_TO_TCHAR(tooltip)), FSlateIcon(), FUIAction(handler), NAME_None,
-		py_uiaction_enum ? (EUserInterfaceActionType::Type)(py_uiaction_enum->val) : EUserInterfaceActionType::Button);
+		(EUserInterfaceActionType::Type)ui_action_type);
 
 	Py_RETURN_NONE;
 }

Source/UnrealEnginePython/Private/Slate/UEPyFSlateIcon.cpp

@@ -1,5 +1,7 @@
 
 #include "UEPyFSlateIcon.h"
+#include "Engine/Texture2D.h"
+#include "Engine/Engine.h"
 
 static PyObject *py_ue_fslate_icon_get_icon(ue_PyFSlateIcon *self, PyObject * args)
 {
@@ -64,6 +66,44 @@ static int ue_py_fslate_icon_init(ue_PyFSlateIcon *self, PyObject *args, PyObjec
 			PyErr_SetString(PyExc_ValueError, "you have not specified as style name");
 			return -1;
 		}
+
+		ISlateStyle const* const foundStyleSet = FSlateStyleRegistry::FindSlateStyle(FName(style_set));
+
+		const FSlateBrush * iconBrush = foundStyleSet->GetBrush(style);
+		FString Path = iconBrush->GetResourceName().ToString();
+
+		// Hack to load in the texture resource object of the icon brush in case it hasn't been already loaded
+		if (!Path.IsEmpty() && iconBrush->GetResourceObject() == nullptr)
+		{
+            if (Path.StartsWith(FSlateBrush::UTextureIdentifier()))
+            {
+				Path = Path.RightChop(FSlateBrush::UTextureIdentifier().Len());
+            }
+
+			UObject* TextureObject = LoadObject<UTexture2D>(NULL, *Path, NULL, LOAD_None, NULL);
+			FSlateBrush* Brush = const_cast<FSlateBrush*>(iconBrush);
+
+			// Set the texture object to a default texture to prevent constant loading of missing textures
+			if (!TextureObject)
+			{
+				UE_LOG(LogSlate, Warning, TEXT("Error loading loading UTexture from path: %s not found"), *Path);
+                if (GEngine)
+                {
+					TextureObject = GEngine->DefaultTexture;
+                }
+			}
+			else
+			{
+				// We do this here because this deprecated system of loading textures will not report references and we dont want the Slate RHI resource manager to manage references
+				TextureObject->AddToRoot();
+			}
+
+            if (TextureObject)
+            {
+				Brush->SetResourceObject(TextureObject);
+            }
+		}
+
 		new(&self->icon) FSlateIcon(FName(style_set), FName(style));
 	}
 	else