Merge branch 'master' into pr_multi_out_params

Author: dfb

Source/UnrealEnginePython/Private/UEPyModule.h

@@ -14,6 +14,15 @@
 #include "Wrappers/UEPyFColor.h"
 #include "Wrappers/UEPyFLinearColor.h"
 
+// backward compatibility for UE4.20 TCHAR_TO_WCHAR
+#ifndef TCHAR_TO_WCHAR
+	// SIZEOF_WCHAR_T is provided by pyconfig.h
+	#if SIZEOF_WCHAR_T == (PLATFORM_TCHAR_IS_4_BYTES ? 4 : 2)
+		#define TCHAR_TO_WCHAR(str) str
+	#else
+		#define TCHAR_TO_WCHAR(str) (wchar_t*)StringCast<wchar_t>(static_cast<const TCHAR*>(str)).Get()
+	#endif
+#endif
 
 
 UWorld *ue_get_uworld(ue_PyUObject *);

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;