merge latest from pr_multi_out_params

Author: dfb

Source/UnrealEnginePython/Private/PythonFunction.cpp

@@ -26,7 +26,7 @@ void UPythonFunction::CallPythonCallable(FFrame& Stack, RESULT_DECL)
 
 	bool on_error = false;
 	bool is_static = function->HasAnyFunctionFlags(FUNC_Static);
-	FOutParmRec *OutParms = nullptr;
+    FOutParmRec *OutParms = nullptr;
 
 	// count the number of arguments
 	Py_ssize_t argn = (Context && !is_static) ? 1 : 0;

Source/UnrealEnginePython/Private/UEPyModule.h

@@ -18,7 +18,6 @@
 // marked as output parameters, but if they are also marked as const refs, then they are actually input parameters)
 #define PROP_IS_OUT_PARAM(prop) ((prop)->HasAllPropertyFlags(CPF_Parm|CPF_OutParm) && !(prop)->HasAllPropertyFlags(CPF_ReferenceParm|CPF_ConstParm))
 
-
 UWorld *ue_get_uworld(ue_PyUObject *);
 AActor *ue_get_actor(ue_PyUObject *);
 PyObject *ue_py_convert_property(UProperty *, uint8 *, int32);

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -292,6 +292,11 @@ private string DiscoverPythonPath(string[] knownPaths, string binaryPath)
         if (!string.IsNullOrEmpty(environmentPath))
             paths.Insert(0, environmentPath);
 
+        // look in an alternate custom location
+        environmentPath = System.Environment.GetEnvironmentVariable("UNREALENGINEPYTHONHOME");
+        if (!string.IsNullOrEmpty(environmentPath))
+            paths.Insert(0, environmentPath);
+
         foreach (string path in paths)
         {
             string actualPath = path;