added is_valid() method

Roberto De Ioris · Roberto De Ioris · commit 1c22936f3d36 · 2017-10-13T08:25:04.000+02:00
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -433,6 +433,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "functions", (PyCFunction)py_ue_functions, METH_VARARGS, "" },
 
 	{ "is_a", (PyCFunction)py_ue_is_a, METH_VARARGS, "" },
+	{ "is_valid", (PyCFunction)py_ue_is_valid, METH_VARARGS, "" },
 	{ "is_child_of", (PyCFunction)py_ue_is_child_of, METH_VARARGS, "" },
 
 	{ "call", (PyCFunction)py_ue_call, METH_VARARGS, "" },
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp b/Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp
@@ -138,6 +138,16 @@ PyObject *py_ue_conditional_begin_destroy(ue_PyUObject *self, PyObject * args)
 	return Py_None;
 }
 
+PyObject *py_ue_is_valid(ue_PyUObject * self, PyObject * args)
+{
+	if (!self->ue_object || !self->ue_object->IsValidLowLevel() || self->ue_object->IsPendingKillOrUnreachable())
+	{
+		Py_RETURN_FALSE;
+	}
+
+	Py_RETURN_TRUE;
+}
+
 PyObject *py_ue_is_a(ue_PyUObject * self, PyObject * args)
 {
 
@@ -158,13 +168,11 @@ PyObject *py_ue_is_a(ue_PyUObject * self, PyObject * args)
 
 	if (self->ue_object->IsA((UClass *)py_obj->ue_object))
 	{
-		Py_INCREF(Py_True);
-		return Py_True;
+		Py_RETURN_TRUE;
 	}
 
 
-	Py_INCREF(Py_False);
-	return Py_False;
+	Py_RETURN_FALSE;
 }
 
 PyObject *py_ue_is_child_of(ue_PyUObject * self, PyObject * args)
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyObject.h b/Source/UnrealEnginePython/Private/UObject/UEPyObject.h
@@ -6,6 +6,7 @@
 
 PyObject *py_ue_get_class(ue_PyUObject *, PyObject *);
 PyObject *py_ue_is_a(ue_PyUObject *, PyObject *);
+PyObject *py_ue_is_valid(ue_PyUObject *, PyObject *);
 PyObject *py_ue_is_child_of(ue_PyUObject *, PyObject *);
 PyObject *py_ue_call_function(ue_PyUObject *, PyObject *, PyObject *);
 PyObject *py_ue_find_function(ue_PyUObject *, PyObject *);

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,16 @@ PyObject py_ue_conditional_begin_destroy(ue_PyUObject self, PyObject * args)`
`138`	`138`	`return Py_None;`
`139`	`139`	`}`
`140`	`140`
	`141`	`+PyObject py_ue_is_valid(ue_PyUObject self, PyObject * args)`
	`142`	`+{`
	`143`	`+ if (!self->ue_object \|\| !self->ue_object->IsValidLowLevel() \|\| self->ue_object->IsPendingKillOrUnreachable())`
	`144`	`+ {`
	`145`	`+ Py_RETURN_FALSE;`
	`146`	`+ }`
	`147`	`+`
	`148`	`+ Py_RETURN_TRUE;`
	`149`	`+}`
	`150`	`+`
`141`	`151`	`PyObject py_ue_is_a(ue_PyUObject self, PyObject * args)`
`142`	`152`	`{`
`143`	`153`
`@@ -158,13 +168,11 @@ PyObject py_ue_is_a(ue_PyUObject self, PyObject * args)`
`158`	`168`
`159`	`169`	`if (self->ue_object->IsA((UClass *)py_obj->ue_object))`
`160`	`170`	`{`
`161`		`- Py_INCREF(Py_True);`
`162`		`- return Py_True;`
	`171`	`+ Py_RETURN_TRUE;`
`163`	`172`	`}`
`164`	`173`
`165`	`174`
`166`		`- Py_INCREF(Py_False);`
`167`		`- return Py_False;`
	`175`	`+ Py_RETURN_FALSE;`
`168`	`176`	`}`
`169`	`177`
`170`	`178`	`PyObject py_ue_is_child_of(ue_PyUObject self, PyObject * args)`