fixed python2 support

20tab · Feb 26, 2018 · ded42b2 · ded42b2
1 parent da126b9
commit ded42b2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -1868,6 +1868,15 @@ void unreal_engine_init_py_module()
 	PyObject *new_unreal_engine_module = PyImport_AddModule("unreal_engine");
 #else
 	PyObject *new_unreal_engine_module = Py_InitModule3("unreal_engine", NULL, unreal_engine_py_doc);
+	ue_PyUObjectType.tp_new = PyType_GenericNew;
+	ue_PyUObjectType.tp_init = (initproc)unreal_engine_py_init;
+	ue_PyUObjectType.tp_dictoffset = offsetof(ue_PyUObject, py_dict);
+
+	if (PyType_Ready(&ue_PyUObjectType) < 0)
+		return;
+
+	Py_INCREF(&ue_PyUObjectType);
+	PyModule_AddObject(new_unreal_engine_module, "UObject", (PyObject *)&ue_PyUObjectType);
 #endif
 	PyObject *unreal_engine_dict = PyModule_GetDict(new_unreal_engine_module);
 
@@ -3603,6 +3612,7 @@ bool do_ue_py_check_childstruct(PyObject *py_obj, UScriptStruct* parent_u_struct
 	return ue_py_struct->u_struct->IsChildOf(parent_u_struct);
 }
 
+#if PY_MAJOR_VERSION >= 3
 static PyObject *init_unreal_engine()
 {
 
@@ -3621,4 +3631,5 @@ static PyObject *init_unreal_engine()
 	PyModule_AddObject(new_unreal_engine_module, "UObject", (PyObject *)&ue_PyUObjectType);
 
 	return new_unreal_engine_module;
-}
+}
+#endif
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -334,7 +334,9 @@ void FUnrealEnginePythonModule::StartupModule()
 		FPlatformMisc::SetEnvironmentVar(TEXT("PATH"), *ModifiedPath);
 		}
 
+#if PY_MAJOR_VERSION >= 3
 	init_unreal_engine_builtin();
+#endif
 
 	Py_Initialize();