attempt to fix PyFbxFactory

Author: Roberto De Ioris

Source/PythonConsole/Private/PyFbxFactory.cpp

@@ -1,6 +1,7 @@
 
 #include "PyFbxFactory.h"
 #include "FbxMeshUtils.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 UPyFbxFactory::UPyFbxFactory(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
@@ -23,6 +24,14 @@ void UPyFbxFactory::PostInitProperties() {
 	ImportUI->MeshTypeToImport = FBXIT_MAX;
 }
 
+UObject * UPyFbxFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled)
+{
+#if ENGINE_MINOR_VERSION >= 20
+	FbxMeshUtils::SetImportOption(ImportUI);
+#endif
+	return Super::FactoryCreateFile(InClass, InParent, InName, Flags, Filename, Parms, Warn, bOutOperationCanceled);
+}
+
 UObject *UPyFbxFactory::FactoryCreateBinary
 (
 	UClass * InClass,

Source/PythonConsole/Public/PyFbxFactory.h

@@ -15,6 +15,7 @@ class UPyFbxFactory : public UFbxFactory
 
 	virtual bool ConfigureProperties() override;
 	virtual void PostInitProperties() override;
+	virtual UObject * FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled) override;
 	virtual UObject * FactoryCreateBinary
 		(
 			UClass * InClass,

Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp

@@ -758,7 +758,7 @@ PyObject *py_ue_set_property_flags(ue_PyUObject *self, PyObject * args)
 	else
 	{
 		u_struct = (UStruct *)self->ue_object->GetClass();
-}
+	}
 
 	UProperty *u_property = u_struct->FindPropertyByName(FName(UTF8_TO_TCHAR(property_name)));
 	if (!u_property)
@@ -806,7 +806,7 @@ PyObject *py_ue_add_property_flags(ue_PyUObject *self, PyObject * args)
 	u_property->SetPropertyFlags(u_property->GetPropertyFlags() | (EPropertyFlags)flags);
 #endif
 	Py_RETURN_NONE;
-	}
+}
 
 PyObject *py_ue_get_property_flags(ue_PyUObject *self, PyObject * args)
 {
@@ -1627,7 +1627,7 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args)
 			if (is_array || is_map)
 				scope->MarkPendingKill();
 			return PyErr_Format(PyExc_Exception, "unable to allocate new UProperty");
-	}
+		}
 		UMapProperty *u_map = (UMapProperty *)scope;
 
 #if ENGINE_MINOR_VERSION < 20
@@ -1676,7 +1676,7 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args)
 		u_map->ValueProp = u_property2;
 
 		u_property = u_map;
-}
+	}
 #endif
 
 	if (u_class == UMulticastDelegateProperty::StaticClass())