added get_inner(), get_key_prop() and get_value_prop()

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -565,6 +565,9 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "get_uproperty", (PyCFunction)py_ue_get_uproperty, METH_VARARGS, "" },
 	{ "get_property_struct", (PyCFunction)py_ue_get_property_struct, METH_VARARGS, "" },
 	{ "get_property_array_dim", (PyCFunction)py_ue_get_property_array_dim, METH_VARARGS, "" },
+	{ "get_inner", (PyCFunction)py_ue_get_inner, METH_VARARGS, "" },
+	{ "get_key_prop", (PyCFunction)py_ue_get_key_prop, METH_VARARGS, "" },
+	{ "get_value_prop", (PyCFunction)py_ue_get_value_prop, METH_VARARGS, "" },
 
 	{ "functions", (PyCFunction)py_ue_functions, METH_VARARGS, "" },
 

Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp

@@ -561,8 +561,7 @@ PyObject *py_ue_find_function(ue_PyUObject * self, PyObject * args)
 	UFunction *function = self->ue_object->FindFunction(FName(UTF8_TO_TCHAR(name)));
 	if (!function)
 	{
-		Py_INCREF(Py_None);
-		return Py_None;
+		Py_RETURN_NONE;
 	}
 
 	Py_RETURN_UOBJECT((UObject *)function);
@@ -1162,6 +1161,54 @@ PyObject *py_ue_get_uproperty(ue_PyUObject *self, PyObject * args)
 
 }
 
+PyObject *py_ue_get_inner(ue_PyUObject *self, PyObject * args)
+{
+
+	ue_py_check(self);
+
+	UArrayProperty *u_property = ue_py_check_type<UArrayProperty>(self);
+	if (!u_property)
+		return PyErr_Format(PyExc_Exception, "object is not a UArrayProperty");
+
+	UProperty* inner = u_property->Inner;
+	if (!inner)
+		Py_RETURN_NONE;
+
+	Py_RETURN_UOBJECT(inner);
+}
+
+PyObject *py_ue_get_key_prop(ue_PyUObject *self, PyObject * args)
+{
+
+	ue_py_check(self);
+
+	UMapProperty *u_property = ue_py_check_type<UMapProperty>(self);
+	if (!u_property)
+		return PyErr_Format(PyExc_Exception, "object is not a UMapProperty");
+
+	UProperty* key = u_property->KeyProp;
+	if (!key)
+		Py_RETURN_NONE;
+
+	Py_RETURN_UOBJECT(key);
+}
+
+PyObject *py_ue_get_value_prop(ue_PyUObject *self, PyObject * args)
+{
+
+	ue_py_check(self);
+
+	UMapProperty *u_property = ue_py_check_type<UMapProperty>(self);
+	if (!u_property)
+		return PyErr_Format(PyExc_Exception, "object is not a UMapProperty");
+
+	UProperty* value = u_property->ValueProp;
+	if (!value)
+		Py_RETURN_NONE;
+
+	Py_RETURN_UOBJECT(value);
+}
+
 PyObject *py_ue_has_property(ue_PyUObject *self, PyObject * args)
 {
 

Source/UnrealEnginePython/Private/UObject/UEPyObject.h

@@ -25,6 +25,9 @@ PyObject *py_ue_call(ue_PyUObject *, PyObject *);
 PyObject *py_ue_get_property(ue_PyUObject *, PyObject *);
 PyObject *py_ue_get_property_array_dim(ue_PyUObject *, PyObject *);
 PyObject *py_ue_get_uproperty(ue_PyUObject *, PyObject *);
+PyObject *py_ue_get_inner(ue_PyUObject *, PyObject *);
+PyObject *py_ue_get_key_prop(ue_PyUObject *, PyObject *);
+PyObject *py_ue_get_value_prop(ue_PyUObject *, PyObject *);
 PyObject *py_ue_get_property_class(ue_PyUObject *, PyObject *);
 PyObject *py_ue_has_property(ue_PyUObject *, PyObject *);
 PyObject *py_ue_is_rooted(ue_PyUObject *, PyObject *);