diff options
author | Jacques Lucke <jacques@blender.org> | 2020-06-10 16:47:31 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-06-10 16:47:31 +0300 |
commit | a58dc25b077bfacf88bcdb8077633f30a049b96a (patch) | |
tree | 1ecce5d35c834855f56d25c89796e8e16a9431ae /source/blender/python/bmesh | |
parent | cc26041d36c53c19874318adb71589748e62ccaa (diff) |
Cleanup: improve custom data type names
This is related to T76659.
This just renames data type names to `CD_PROP_STRING`, `CD_PROP_FLOAT`
and `CD_PROP_INT32`. It makes them a bit more specific and removes
unnecessary abbreviations.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D7980
Diffstat (limited to 'source/blender/python/bmesh')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_customdata.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index ffddfb4a7e1..652b6ecf894 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -184,17 +184,17 @@ static PyGetSetDef bpy_bmlayeraccess_vert_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"shape", (getter)bpy_bmlayeraccess_collection_get, @@ -225,17 +225,17 @@ static PyGetSetDef bpy_bmlayeraccess_edge_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"bevel_weight", (getter)bpy_bmlayeraccess_collection_get, @@ -263,17 +263,17 @@ static PyGetSetDef bpy_bmlayeraccess_face_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"face_map", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, @@ -296,17 +296,17 @@ static PyGetSetDef bpy_bmlayeraccess_loop_getseters[] = { (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__float_doc, - (void *)CD_PROP_FLT}, + (void *)CD_PROP_FLOAT}, {"int", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__int_doc, - (void *)CD_PROP_INT}, + (void *)CD_PROP_INT32}, {"string", (getter)bpy_bmlayeraccess_collection_get, (setter)NULL, bpy_bmlayeraccess_collection__string_doc, - (void *)CD_PROP_STR}, + (void *)CD_PROP_STRING}, {"uv", (getter)bpy_bmlayeraccess_collection_get, @@ -1071,17 +1071,17 @@ PyObject *BPy_BMLayerItem_GetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer) ret = BPy_BMDeformVert_CreatePyObject(value); break; } - case CD_PROP_FLT: + case CD_PROP_FLOAT: case CD_PAINT_MASK: { ret = PyFloat_FromDouble(*(float *)value); break; } - case CD_PROP_INT: + case CD_PROP_INT32: case CD_FACEMAP: { ret = PyLong_FromLong(*(int *)value); break; } - case CD_PROP_STR: { + case CD_PROP_STRING: { MStringProperty *mstring = value; ret = PyBytes_FromStringAndSize(mstring->s, mstring->s_len); break; @@ -1134,7 +1134,7 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj ret = BPy_BMDeformVert_AssignPyObject(value, py_value); break; } - case CD_PROP_FLT: + case CD_PROP_FLOAT: case CD_PAINT_MASK: { float tmp_val = PyFloat_AsDouble(py_value); if (UNLIKELY(tmp_val == -1 && PyErr_Occurred())) { @@ -1147,7 +1147,7 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj } break; } - case CD_PROP_INT: + case CD_PROP_INT32: case CD_FACEMAP: { int tmp_val = PyC_Long_AsI32(py_value); if (UNLIKELY(tmp_val == -1 && PyErr_Occurred())) { @@ -1159,7 +1159,7 @@ int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObj } break; } - case CD_PROP_STR: { + case CD_PROP_STRING: { MStringProperty *mstring = value; char *tmp_val; Py_ssize_t tmp_val_len; |