archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use "pyrna_enum_*" prefix for RNA utility functions

Browse Source
This commit is contained in:
Campbell Barton
2021-09-01 16:50:48 +10:00
parent 1730829592
commit 89fa9aada5
7 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/python/intern/bpy_operator.c
View File

@@ -108,7 +108,7 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
if (context_str) {
if (RNA_enum_value_from_id(rna_enum_operator_context_items, context_str, &context) == 0) {
char *enum_str = BPy_enum_as_string(rna_enum_operator_context_items);
char *enum_str = pyrna_enum_repr(rna_enum_operator_context_items);
PyErr_Format(PyExc_TypeError,
"Calling operator \"bpy.ops.%s.poll\" error, "
"expected a string enum in (%s)",
@@ -210,7 +210,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
if (context_str) {
if (RNA_enum_value_from_id(rna_enum_operator_context_items, context_str, &context) == 0) {
char *enum_str = BPy_enum_as_string(rna_enum_operator_context_items);
char *enum_str = pyrna_enum_repr(rna_enum_operator_context_items);
PyErr_Format(PyExc_TypeError,
"Calling operator \"bpy.ops.%s\" error, "
"expected a string enum in (%s)",
@@ -347,7 +347,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
BPY_modules_update();
/* return operator_ret as a bpy enum */
return pyrna_enum_bitfield_to_py(rna_enum_operator_return_items, operator_ret);
return pyrna_enum_bitfield_as_set(rna_enum_operator_return_items, operator_ret);
}
static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
@@ -460,7 +460,7 @@ static PyObject *pyop_get_bl_options(PyObject *UNUSED(self), PyObject *value)
if ((ot = ot_lookup_from_py_string(value, "get_bl_options")) == NULL) {
return NULL;
}
return pyrna_enum_bitfield_to_py(rna_enum_operator_type_flag_items, ot->flag);
return pyrna_enum_bitfield_as_set(rna_enum_operator_type_flag_items, ot->flag);
}
static struct PyMethodDef bpy_ops_methods[] = {