improved flags management

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -721,6 +721,8 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "class_set_flags", (PyCFunction)py_ue_class_set_flags, METH_VARARGS, "" },
 	{ "get_obj_flags", (PyCFunction)py_ue_get_obj_flags, METH_VARARGS, "" },
 	{ "set_obj_flags", (PyCFunction)py_ue_set_obj_flags, METH_VARARGS, "" },
+	{ "clear_obj_flags", (PyCFunction)py_ue_clear_obj_flags, METH_VARARGS, "" },
+	{ "reset_obj_flags", (PyCFunction)py_ue_reset_obj_flags, METH_VARARGS, "" },
 
 #if WITH_EDITOR
 	{ "class_get_config_name", (PyCFunction)py_ue_class_get_config_name, METH_VARARGS, "" },

Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp

@@ -83,16 +83,47 @@ PyObject *py_ue_set_obj_flags(ue_PyUObject * self, PyObject * args)
 	ue_py_check(self);
 
 	uint64 flags;
-	if (!PyArg_ParseTuple(args, "K:set_obj_flags", &flags))
+	PyObject *py_reset = nullptr;
+	if (!PyArg_ParseTuple(args, "K|O:set_obj_flags", &flags, &py_reset))
 	{
 		return nullptr;
 	}
 
+	if (py_reset && PyObject_IsTrue(py_reset))
+	{
+		self->ue_object->ClearFlags(self->ue_object->GetFlags());
+	}
+
 	self->ue_object->SetFlags((EObjectFlags)flags);
 
 	Py_RETURN_NONE;
 }
 
+PyObject *py_ue_clear_obj_flags(ue_PyUObject * self, PyObject * args)
+{
+
+	ue_py_check(self);
+
+	uint64 flags;
+	if (!PyArg_ParseTuple(args, "K:clear_obj_flags", &flags))
+	{
+		return nullptr;
+	}
+
+	self->ue_object->ClearFlags((EObjectFlags)flags);
+
+	Py_RETURN_NONE;
+}
+
+PyObject *py_ue_reset_obj_flags(ue_PyUObject * self, PyObject * args)
+{
+
+	ue_py_check(self);
+
+	self->ue_object->ClearFlags(self->ue_object->GetFlags());
+
+	Py_RETURN_NONE;
+}
 
 #if WITH_EDITOR
 PyObject *py_ue_class_set_config_name(ue_PyUObject * self, PyObject * args)
@@ -723,7 +754,7 @@ PyObject *py_ue_set_property_flags(ue_PyUObject *self, PyObject * args)
 	else
 	{
 		u_struct = (UStruct *)self->ue_object->GetClass();
-	}
+}
 
 	UProperty *u_property = u_struct->FindPropertyByName(FName(UTF8_TO_TCHAR(property_name)));
 	if (!u_property)
@@ -771,7 +802,7 @@ PyObject *py_ue_add_property_flags(ue_PyUObject *self, PyObject * args)
 	u_property->SetPropertyFlags(u_property->GetPropertyFlags() | (EPropertyFlags)flags);
 #endif
 	Py_RETURN_NONE;
-}
+	}
 
 PyObject *py_ue_get_property_flags(ue_PyUObject *self, PyObject * args)
 {
@@ -1543,7 +1574,7 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args)
 			if (is_array || is_map)
 				scope->MarkPendingKill();
 			return PyErr_Format(PyExc_Exception, "unable to allocate new UProperty");
-		}
+	}
 		UMapProperty *u_map = (UMapProperty *)scope;
 
 #if ENGINE_MINOR_VERSION < 20
@@ -1592,7 +1623,7 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args)
 		u_map->ValueProp = u_property2;
 
 		u_property = u_map;
-	}
+}
 #endif
 
 	if (u_class == UMulticastDelegateProperty::StaticClass())

Source/UnrealEnginePython/Private/UObject/UEPyObject.h

@@ -72,6 +72,8 @@ PyObject *py_ue_class_get_flags(ue_PyUObject *, PyObject *);
 PyObject *py_ue_class_set_flags(ue_PyUObject *, PyObject *);
 PyObject *py_ue_get_obj_flags(ue_PyUObject *, PyObject *);
 PyObject *py_ue_set_obj_flags(ue_PyUObject *, PyObject *);
+PyObject *py_ue_clear_obj_flags(ue_PyUObject *, PyObject *);
+PyObject *py_ue_reset_obj_flags(ue_PyUObject *, PyObject *);
 PyObject *py_ue_delegate_bind_ufunction(ue_PyUObject *, PyObject *);