diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 05:49:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:09 +0300 |
| commit | 676d790d29ead413a9619aa94005c5248d274cb2 (patch) | |
| tree | 65fd0b6728a6f2d3db0b8e1dbe0be9edacf1d1d8 /source/blender/python/intern/bpy_operator.c | |
| parent | a269287f36cfb99621fc8a5172c050f4a1046ba1 (diff) | |
Cleanup: use `rna_enum_` prefix for RNA enums
Definitions could shadow local vars.
Diffstat (limited to 'source/blender/python/intern/bpy_operator.c')
| -rw-r--r-- | source/blender/python/intern/bpy_operator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 7cccc204088..d6c57f4c302 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -98,8 +98,8 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args) } if (context_str) { - if (RNA_enum_value_from_id(operator_context_items, context_str, &context) == 0) { - char *enum_str = BPy_enum_as_string(operator_context_items); + 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); PyErr_Format(PyExc_TypeError, "Calling operator \"bpy.ops.%s.poll\" error, " "expected a string enum in (%s)", @@ -184,8 +184,8 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args) } if (context_str) { - if (RNA_enum_value_from_id(operator_context_items, context_str, &context) == 0) { - char *enum_str = BPy_enum_as_string(operator_context_items); + 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); PyErr_Format(PyExc_TypeError, "Calling operator \"bpy.ops.%s\" error, " "expected a string enum in (%s)", @@ -301,7 +301,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args) bpy_import_main_set(CTX_data_main(C)); /* return operator_ret as a bpy enum */ - return pyrna_enum_bitfield_to_py(operator_return_items, operator_ret); + return pyrna_enum_bitfield_to_py(rna_enum_operator_return_items, operator_ret); } |