Merge branch 'master' of https://github.com/20tab/UnrealEnginePython

Roberto De Ioris · Roberto De Ioris · commit 6f6fa94245a8 · 2018-09-17T14:36:07.000+02:00
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ The currently supported Unreal Engine versions are 4.12, 4.13, 4.14, 4.15, 4.16,
 
 We support official python.org releases as well as IntelPython and Anaconda distributions.
 
-Note: this plugin has nothing to do with the experimental 'PythonScriptPlugin' included in Unreal Engine >= 4.19. We aim at full integration with engine and editor (included the Slate api), as well as support for the vast majority of python features like asyncio, coroutines, generators, threads and third party modules.
+Note: this plugin has nothing to do with the experimental 'PythonScriptPlugin' included in Unreal Engine >= 4.19. We aim at full integration with engine and editor (included the Slate api, check here: https://github.com/20tab/UnrealEnginePython/blob/master/docs/Slate_API.md), as well as support for the vast majority of python features like asyncio, coroutines, generators, threads and third party modules.
 
 # Binary installation on Windows (64 bit)
 
diff --git a/Source/UnrealEnginePython/Private/PythonFunction.cpp b/Source/UnrealEnginePython/Private/PythonFunction.cpp
@@ -19,13 +19,17 @@ void UPythonFunction::CallPythonCallable(FFrame& Stack, RESULT_DECL)
 
 	FScopePythonGIL gil;
 
+#if ENGINE_MINOR_VERSION <= 18
+	UObject *Context = Stack.Object;
+#endif
+
 	UPythonFunction *function = static_cast<UPythonFunction *>(Stack.CurrentNativeFunction);
 
 	bool on_error = false;
 	bool is_static = function->HasAnyFunctionFlags(FUNC_Static);
 
 	// count the number of arguments
-	Py_ssize_t argn = (Stack.Object && !is_static) ? 1 : 0;
+	Py_ssize_t argn = (Context && !is_static) ? 1 : 0;
 	TFieldIterator<UProperty> IArgs(function);
 	for (; IArgs && ((IArgs->PropertyFlags & (CPF_Parm | CPF_ReturnParm)) == CPF_Parm); ++IArgs) {
 		argn++;
@@ -34,22 +38,22 @@ void UPythonFunction::CallPythonCallable(FFrame& Stack, RESULT_DECL)
 	UE_LOG(LogPython, Warning, TEXT("Initializing %d parameters"), argn);
 #endif
 	PyObject *py_args = PyTuple_New(argn);
+	argn = 0;
 
-	if (Stack.Object && !is_static) {
-		PyObject *py_obj = (PyObject *)ue_get_python_uobject(Stack.Object);
+	if (Context && !is_static) {
+		PyObject *py_obj = (PyObject *)ue_get_python_uobject(Context);
 		if (!py_obj) {
 			unreal_engine_py_log_error();
 			on_error = true;
 		}
 		else {
 			Py_INCREF(py_obj);
-			PyTuple_SetItem(py_args, 0, py_obj);
+			PyTuple_SetItem(py_args, argn++, py_obj);
 		}
 	}
 
 	uint8 *frame = Stack.Locals;
 
-	argn = (Stack.Object && !is_static) ? 1 : 0;
 	// is it a blueprint call ?
 	if (*Stack.Code == EX_EndFunctionParms) {
 		for (UProperty *prop = (UProperty *)function->Children; prop; prop = (UProperty *)prop->Next) {
@@ -127,4 +131,4 @@ UPythonFunction::~UPythonFunction()
 #if defined(UEPY_MEMORY_DEBUG)
 	UE_LOG(LogPython, Warning, TEXT("PythonFunction callable %p XDECREF'ed"), this);
 #endif
-}
+}
diff --git a/docs/Slate_API.md b/docs/Slate_API.md
@@ -739,7 +739,7 @@ More infos here: https://api.unrealengine.com/INT/API/Editor/PropertyEditor/SObj
 
 ## SPythonEditorViewport
 
-This is probably tu funniest widget, an EditorViewportClient and a whole World all in a single SWidget:
+This is probably the funniest widget, an EditorViewportClient and a whole World all in a single SWidget:
 
 ```python
 from unreal_engine import SWindow, SPythonEditorViewport, FVector, FRotator
