diff options
Diffstat (limited to 'source/blender/python/bmesh')
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_api.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_geometry.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_ops.c | 8 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_ops.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_ops_call.c | 24 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_ops_call.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.c | 680 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_customdata.c | 108 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_customdata.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.c | 113 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_select.c | 76 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_select.h | 5 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.c | 63 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.h | 5 |
16 files changed, 502 insertions, 615 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_api.h b/source/blender/python/bmesh/bmesh_py_api.h index 9f227b21440..357f416f266 100644 --- a/source/blender/python/bmesh/bmesh_py_api.h +++ b/source/blender/python/bmesh/bmesh_py_api.h @@ -21,9 +21,6 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_API_H__ -#define __BMESH_PY_API_H__ +#pragma once PyObject *BPyInit_bmesh(void); - -#endif /* __BMESH_PY_API_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_geometry.h b/source/blender/python/bmesh/bmesh_py_geometry.h index 98d336828dc..dcb8c59f68b 100644 --- a/source/blender/python/bmesh/bmesh_py_geometry.h +++ b/source/blender/python/bmesh/bmesh_py_geometry.h @@ -21,9 +21,6 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_GEOMETRY_H__ -#define __BMESH_PY_GEOMETRY_H__ +#pragma once PyObject *BPyInit_bmesh_geometry(void); - -#endif /* __BMESH_PY_GEOMETRY_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_ops.c b/source/blender/python/bmesh/bmesh_py_ops.c index 1eccfe06d15..cdbd4832159 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.c +++ b/source/blender/python/bmesh/bmesh_py_ops.c @@ -250,11 +250,9 @@ static PyObject *bpy_bmesh_ops_fakemod_getattro(PyObject *UNUSED(self), PyObject if (BMO_opcode_from_opname(opname) != -1) { return bpy_bmesh_op_CreatePyObject(opname); } - else { - PyErr_Format( - PyExc_AttributeError, "BMeshOpsModule: operator \"%.200s\" doesn't exist", opname); - return NULL; - } + + PyErr_Format(PyExc_AttributeError, "BMeshOpsModule: operator \"%.200s\" doesn't exist", opname); + return NULL; } static PyObject *bpy_bmesh_ops_fakemod_dir(PyObject *UNUSED(self)) diff --git a/source/blender/python/bmesh/bmesh_py_ops.h b/source/blender/python/bmesh/bmesh_py_ops.h index a4a12bbef61..442af51fd17 100644 --- a/source/blender/python/bmesh/bmesh_py_ops.h +++ b/source/blender/python/bmesh/bmesh_py_ops.h @@ -21,9 +21,6 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_OPS_H__ -#define __BMESH_PY_OPS_H__ +#pragma once PyObject *BPyInit_bmesh_ops(void); - -#endif /* __BMESH_PY_OPS_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index b1e5c1c761b..a387ba31c84 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -82,7 +82,7 @@ static int bpy_slot_from_py_elem_check(BPy_BMElem *value, Py_TYPE(value)->tp_name); return -1; } - else if (value->bm == NULL) { + if (value->bm == NULL) { PyErr_Format(PyExc_TypeError, "%.200s: keyword \"%.200s\" %.200s invalidated element", opname, @@ -90,7 +90,7 @@ static int bpy_slot_from_py_elem_check(BPy_BMElem *value, descr); return -1; } - else if (value->bm != bm) { /* we may want to make this check optional by setting 'bm' to NULL */ + if (value->bm != bm) { /* we may want to make this check optional by setting 'bm' to NULL */ PyErr_Format(PyExc_TypeError, "%.200s: keyword \"%.200s\" %.200s invalidated element", opname, @@ -127,7 +127,7 @@ static int bpy_slot_from_py_elemseq_check(BPy_BMGeneric *value, descr); return -1; } - else if (value->bm != bm) { /* we may want to make this check optional by setting 'bm' to NULL */ + if (value->bm != bm) { /* we may want to make this check optional by setting 'bm' to NULL */ PyErr_Format(PyExc_TypeError, "%.200s: keyword \"%.200s\" %.200s, invalidated sequence", opname, @@ -135,7 +135,7 @@ static int bpy_slot_from_py_elemseq_check(BPy_BMGeneric *value, descr); return -1; } - else if ((htype_py & htype_bmo) == 0) { + if ((htype_py & htype_bmo) == 0) { char str_bmo[32]; char str_py[32]; PyErr_Format(PyExc_TypeError, @@ -175,9 +175,8 @@ static int bpy_slot_from_py(BMesh *bm, Py_TYPE(value)->tp_name); return -1; } - else { - BMO_SLOT_AS_BOOL(slot) = param; - } + + BMO_SLOT_AS_BOOL(slot) = param; break; } @@ -223,9 +222,8 @@ static int bpy_slot_from_py(BMesh *bm, Py_TYPE(value)->tp_name); return -1; } - else { - BMO_SLOT_AS_INT(slot) = param; - } + + BMO_SLOT_AS_INT(slot) = param; } break; } @@ -239,9 +237,9 @@ static int bpy_slot_from_py(BMesh *bm, Py_TYPE(value)->tp_name); return -1; } - else { - BMO_SLOT_AS_FLOAT(slot) = param; - } + + BMO_SLOT_AS_FLOAT(slot) = param; + break; } case BMO_OP_SLOT_MAT: { diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.h b/source/blender/python/bmesh/bmesh_py_ops_call.h index 7b6611cd61d..6d9ceec73f6 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.h +++ b/source/blender/python/bmesh/bmesh_py_ops_call.h @@ -21,8 +21,7 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_OPS_CALL_H__ -#define __BMESH_PY_OPS_CALL_H__ +#pragma once typedef struct { PyObject_HEAD /* required python macro */ @@ -30,5 +29,3 @@ typedef struct { } BPy_BMeshOpFunc; PyObject *BPy_BMO_call(BPy_BMeshOpFunc *self, PyObject *args, PyObject *kw); - -#endif /* __BMESH_PY_OPS_CALL_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index fccdfe7fbdc..e39b5faf3c4 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -292,14 +292,13 @@ static int bpy_bmesh_select_mode_set(BPy_BMesh *self, PyObject *value) -1) { return -1; } - else if (flag == 0) { + if (flag == 0) { PyErr_SetString(PyExc_TypeError, "bm.select_mode: cant assignt an empty value"); return -1; } - else { - self->bm->selectmode = flag; - return 0; - } + + self->bm->selectmode = flag; + return 0; } PyDoc_STRVAR(bpy_bmesh_select_history_doc, @@ -338,9 +337,8 @@ static int bpy_bmvert_co_set(BPy_BMVert *self, PyObject *value) if (mathutils_array_parse(self->v->co, 3, 3, value, "BMVert.co") != -1) { return 0; } - else { - return -1; - } + + return -1; } PyDoc_STRVAR( @@ -359,9 +357,8 @@ static int bpy_bmvert_normal_set(BPy_BMVert *self, PyObject *value) if (mathutils_array_parse(self->v->no, 3, 3, value, "BMVert.normal") != -1) { return 0; } - else { - return -1; - } + + return -1; } PyDoc_STRVAR(bpy_bmvert_is_manifold_doc, @@ -453,9 +450,8 @@ static int bpy_bmface_normal_set(BPy_BMFace *self, PyObject *value) if (mathutils_array_parse(self->f->no, 3, 3, value, "BMFace.normal") != -1) { return 0; } - else { - return -1; - } + + return -1; } PyDoc_STRVAR(bpy_bmface_material_index_doc, "The face's material index.\n\n:type: int"); @@ -481,10 +477,9 @@ static int bpy_bmface_material_index_set(BPy_BMFace *self, PyObject *value) PyErr_SetString(PyExc_ValueError, "material index outside of usable range (0 - 32766)"); return -1; } - else { - self->f->mat_nr = (short)param; - return 0; - } + + self->f->mat_nr = (short)param; + return 0; } /* Loop @@ -586,9 +581,8 @@ static PyObject *bpy_bmfaceseq_active_get(BPy_BMElemSeq *self, void *UNUSED(clos if (bm->act_face) { return BPy_BMElem_CreatePyObject(bm, (BMHeader *)bm->act_face); } - else { - Py_RETURN_NONE; - } + + Py_RETURN_NONE; } static int bpy_bmfaceseq_active_set(BPy_BMElem *self, PyObject *value, void *UNUSED(closure)) @@ -598,18 +592,17 @@ static int bpy_bmfaceseq_active_set(BPy_BMElem *self, PyObject *value, void *UNU bm->act_face = NULL; return 0; } - else if (BPy_BMFace_Check(value)) { + if (BPy_BMFace_Check(value)) { BPY_BM_CHECK_SOURCE_INT(bm, "faces.active = f", value); bm->act_face = ((BPy_BMFace *)value)->f; return 0; } - else { - PyErr_Format(PyExc_TypeError, - "faces.active = f: expected BMFace or None, not %.200s", - Py_TYPE(value)->tp_name); - return -1; - } + + PyErr_Format(PyExc_TypeError, + "faces.active = f: expected BMFace or None, not %.200s", + Py_TYPE(value)->tp_name); + return -1; } static PyGetSetDef bpy_bmesh_getseters[] = { @@ -971,10 +964,9 @@ static PyObject *bpy_bmesh_copy(BPy_BMesh *self) if (bm_copy) { return BPy_BMesh_CreatePyObject(bm_copy, BPY_BMFLAG_NOP); } - else { - PyErr_SetString(PyExc_SystemError, "Unable to copy BMesh, internal error"); - return NULL; - } + + PyErr_SetString(PyExc_SystemError, "Unable to copy BMesh, internal error"); + return NULL; } PyDoc_STRVAR(bpy_bmesh_clear_doc, @@ -1141,9 +1133,8 @@ static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args, PyObject "evaluation mode is RENDER"); return NULL; } - else { - me_eval = mesh_create_eval_final_render(depsgraph, scene_eval, ob_eval, &data_masks); - } + + me_eval = mesh_create_eval_final_render(depsgraph, scene_eval, ob_eval, &data_masks); } else { if (use_cage) { @@ -1161,7 +1152,7 @@ static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args, PyObject "from_object(...): cage arg is unsupported when deform=False"); return NULL; } - else if (use_render) { + if (use_render) { me_eval = mesh_create_eval_no_deform_render(depsgraph, scene_eval, ob, &data_masks); } else { @@ -1329,38 +1320,36 @@ static PyObject *bpy_bmesh_transform(BPy_BMElem *self, PyObject *args, PyObject &filter)) { return NULL; } - else { - BMVert *eve; - BMIter iter; - void *mat_ptr; - if (BaseMath_ReadCallback(mat) == -1) { - return NULL; - } - else if (mat->num_col != 4 || mat->num_row != 4) { - PyErr_SetString(PyExc_ValueError, "expected a 4x4 matrix"); - return NULL; - } + BMVert *eve; + BMIter iter; + void *mat_ptr; - if (filter != NULL && - PyC_FlagSet_ToBitfield(bpy_bm_hflag_all_flags, filter, &filter_flags, "bm.transform") == - -1) { - return NULL; - } + if (BaseMath_ReadCallback(mat) == -1) { + return NULL; + } + if (mat->num_col != 4 || mat->num_row != 4) { + PyErr_SetString(PyExc_ValueError, "expected a 4x4 matrix"); + return NULL; + } - mat_ptr = mat->matrix; + if (filter != NULL && PyC_FlagSet_ToBitfield( + bpy_bm_hflag_all_flags, filter, &filter_flags, "bm.transform") == -1) { + return NULL; + } - if (!filter_flags) { - BM_ITER_MESH (eve, &iter, self->bm, BM_VERTS_OF_MESH) { - mul_m4_v3((float(*)[4])mat_ptr, eve->co); - } + mat_ptr = mat->matrix; + + if (!filter_flags) { + BM_ITER_MESH (eve, &iter, self->bm, BM_VERTS_OF_MESH) { + mul_m4_v3((float(*)[4])mat_ptr, eve->co); } - else { - char filter_flags_ch = (char)filter_flags; - BM_ITER_MESH (eve, &iter, self->bm, BM_VERTS_OF_MESH) { - if (BM_elem_flag_test(eve, filter_flags_ch)) { - mul_m4_v3((float(*)[4])mat_ptr, eve->co); - } + } + else { + char filter_flags_ch = (char)filter_flags; + BM_ITER_MESH (eve, &iter, self->bm, BM_VERTS_OF_MESH) { + if (BM_elem_flag_test(eve, filter_flags_ch)) { + mul_m4_v3((float(*)[4])mat_ptr, eve->co); } } } @@ -1388,9 +1377,8 @@ static PyObject *bpy_bmesh_calc_volume(BPy_BMElem *self, PyObject *args, PyObjec args, kw, "|O!:calc_volume", (char **)kwlist, &PyBool_Type, &is_signed)) { return NULL; } - else { - return PyFloat_FromDouble(BM_mesh_calc_volume(self->bm, is_signed != Py_False)); - } + + return PyFloat_FromDouble(BM_mesh_calc_volume(self->bm, is_signed != Py_False)); } PyDoc_STRVAR(bpy_bmesh_calc_loop_triangles_doc, @@ -1531,30 +1519,29 @@ static PyObject *bpy_bmvert_copy_from_vert_interp(BPy_BMVert *self, PyObject *ar if (!PyArg_ParseTuple(args, "Of:BMVert.copy_from_vert_interp", &vert_seq, &fac)) { return NULL; } - else { - BMesh *bm = self->bm; - BMVert **vert_array = NULL; - Py_ssize_t vert_seq_len; /* always 2 */ - - vert_array = BPy_BMElem_PySeq_As_Array(&bm, - vert_seq, - 2, - 2, - &vert_seq_len, - BM_VERT, - true, - true, - "BMVert.copy_from_vert_interp(...)"); - - if (vert_array == NULL) { - return NULL; - } - - BM_data_interp_from_verts(bm, vert_array[0], vert_array[1], self->v, clamp_f(fac, 0.0f, 1.0f)); - PyMem_FREE(vert_array); - Py_RETURN_NONE; + BMesh *bm = self->bm; + BMVert **vert_array = NULL; + Py_ssize_t vert_seq_len; /* always 2 */ + + vert_array = BPy_BMElem_PySeq_As_Array(&bm, + vert_seq, + 2, + 2, + &vert_seq_len, + BM_VERT, + true, + true, + "BMVert.copy_from_vert_interp(...)"); + + if (vert_array == NULL) { + return NULL; } + + BM_data_interp_from_verts(bm, vert_array[0], vert_array[1], self->v, clamp_f(fac, 0.0f, 1.0f)); + + PyMem_FREE(vert_array); + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmvert_copy_from_face_interp_doc, @@ -1574,15 +1561,14 @@ static PyObject *bpy_bmvert_copy_from_face_interp(BPy_BMVert *self, PyObject *ar if (!PyArg_ParseTuple(args, "O!:BMVert.copy_from_face_interp", &BPy_BMFace_Type, &py_face)) { return NULL; } - else { - BMesh *bm = self->bm; - BPY_BM_CHECK_SOURCE_OBJ(bm, "copy_from_face_interp()", py_face); + BMesh *bm = self->bm; - BM_vert_interp_from_face(bm, self->v, py_face->f); + BPY_BM_CHECK_SOURCE_OBJ(bm, "copy_from_face_interp()", py_face); - Py_RETURN_NONE; - } + BM_vert_interp_from_face(bm, self->v, py_face->f); + + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmvert_calc_edge_angle_doc, @@ -1615,12 +1601,11 @@ static PyObject *bpy_bmvert_calc_edge_angle(BPy_BMVert *self, PyObject *args) Py_INCREF(fallback); return fallback; } - else { - PyErr_SetString(PyExc_ValueError, - "BMVert.calc_edge_angle(): " - "vert must connect to exactly 2 edges"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, + "BMVert.calc_edge_angle(): " + "vert must connect to exactly 2 edges"); + return NULL; } return PyFloat_FromDouble(angle); @@ -1697,12 +1682,11 @@ static PyObject *bpy_bmedge_calc_face_angle(BPy_BMEdge *self, PyObject *args) Py_INCREF(fallback); return fallback; } - else { - PyErr_SetString(PyExc_ValueError, - "BMEdge.calc_face_angle(): " - "edge doesn't use 2 faces"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, + "BMEdge.calc_face_angle(): " + "edge doesn't use 2 faces"); + return NULL; } return PyFloat_FromDouble(angle); @@ -1737,12 +1721,11 @@ static PyObject *bpy_bmedge_calc_face_angle_signed(BPy_BMEdge *self, PyObject *a Py_INCREF(fallback); return fallback; } - else { - PyErr_SetString(PyExc_ValueError, - "BMEdge.calc_face_angle_signed(): " - "edge doesn't use 2 faces"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, + "BMEdge.calc_face_angle_signed(): " + "edge doesn't use 2 faces"); + return NULL; } return PyFloat_FromDouble(angle); @@ -1767,13 +1750,12 @@ static PyObject *bpy_bmedge_calc_tangent(BPy_BMEdge *self, PyObject *args) if (!PyArg_ParseTuple(args, "O!:BMEdge.calc_face_tangent", &BPy_BMLoop_Type, &py_loop)) { return NULL; } - else { - float vec[3]; - BPY_BM_CHECK_OBJ(py_loop); - /* no need to check if they are from the same mesh or even connected */ - BM_edge_calc_face_tangent(self->e, py_loop->l, vec); - return Vector_CreatePyObject(vec, 3, NULL); - } + + float vec[3]; + BPY_BM_CHECK_OBJ(py_loop); + /* no need to check if they are from the same mesh or even connected */ + BM_edge_calc_face_tangent(self->e, py_loop->l, vec); + return Vector_CreatePyObject(vec, 3, NULL); } PyDoc_STRVAR( @@ -1805,10 +1787,9 @@ static PyObject *bpy_bmedge_other_vert(BPy_BMEdge *self, BPy_BMVert *value) if (other) { return BPy_BMVert_CreatePyObject(self->bm, other); } - else { - /* could raise an exception here */ - Py_RETURN_NONE; - } + + /* could raise an exception here */ + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmedge_normal_update_doc, @@ -1852,15 +1833,14 @@ static PyObject *bpy_bmface_copy_from_face_interp(BPy_BMFace *self, PyObject *ar &do_vertex)) { return NULL; } - else { - BMesh *bm = self->bm; - BPY_BM_CHECK_SOURCE_OBJ(bm, "BMFace.copy_from_face_interp(face)", py_face); + BMesh *bm = self->bm; - BM_face_interp_from_face(bm, self->f, py_face->f, do_vertex); + BPY_BM_CHECK_SOURCE_OBJ(bm, "BMFace.copy_from_face_interp(face)", py_face); - Py_RETURN_NONE; - } + BM_face_interp_from_face(bm, self->f, py_face->f, do_vertex); + + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmface_copy_doc, @@ -1901,11 +1881,9 @@ static PyObject *bpy_bmface_copy(BPy_BMFace *self, PyObject *args, PyObject *kw) if (f_cpy) { return BPy_BMFace_CreatePyObject(bm, f_cpy); } - else { - PyErr_SetString(PyExc_ValueError, - "BMFace.copy(): couldn't create the new face, internal error"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, "BMFace.copy(): couldn't create the new face, internal error"); + return NULL; } PyDoc_STRVAR(bpy_bmface_calc_area_doc, @@ -2109,15 +2087,14 @@ static PyObject *bpy_bmloop_copy_from_face_interp(BPy_BMLoop *self, PyObject *ar &do_multires)) { return NULL; } - else { - BMesh *bm = self->bm; - BPY_BM_CHECK_SOURCE_OBJ(bm, "BMLoop.copy_from_face_interp(face)", py_face); + BMesh *bm = self->bm; - BM_loop_interp_from_face(bm, self->l, py_face->f, do_vertex, do_multires); + BPY_BM_CHECK_SOURCE_OBJ(bm, "BMLoop.copy_from_face_interp(face)", py_face); - Py_RETURN_NONE; - } + BM_loop_interp_from_face(bm, self->l, py_face->f, do_vertex, do_multires); + + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmloop_calc_angle_doc, @@ -2190,33 +2167,32 @@ static PyObject *bpy_bmvertseq_new(BPy_BMElemSeq *self, PyObject *args) if (!PyArg_ParseTuple(args, "|OO!:verts.new", &py_co, &BPy_BMVert_Type, &py_vert_example)) { return NULL; } - else { - BMesh *bm = self->bm; - BMVert *v; - float co[3] = {0.0f, 0.0f, 0.0f}; - if (py_vert_example) { - BPY_BM_CHECK_OBJ(py_vert_example); - } + BMesh *bm = self->bm; + BMVert *v; + float co[3] = {0.0f, 0.0f, 0.0f}; - if (py_co && mathutils_array_parse(co, 3, 3, py_co, "verts.new(co)") == -1) { - return NULL; - } + if (py_vert_example) { + BPY_BM_CHECK_OBJ(py_vert_example); + } - v = BM_vert_create(bm, co, NULL, BM_CREATE_NOP); + if (py_co && mathutils_array_parse(co, 3, 3, py_co, "verts.new(co)") == -1) { + return NULL; + } - if (v == NULL) { - PyErr_SetString(PyExc_ValueError, - "faces.new(verts): couldn't create the new face, internal error"); - return NULL; - } + v = BM_vert_create(bm, co, NULL, BM_CREATE_NOP); - if (py_vert_example) { - BM_elem_attrs_copy(py_vert_example->bm, bm, py_vert_example->v, v); - } + if (v == NULL) { + PyErr_SetString(PyExc_ValueError, + "faces.new(verts): couldn't create the new face, internal error"); + return NULL; + } - return BPy_BMVert_CreatePyObject(bm, v); + if (py_vert_example) { + BM_elem_attrs_copy(py_vert_example->bm, bm, py_vert_example->v, v); } + + return BPy_BMVert_CreatePyObject(bm, v); } /* Edge Seq @@ -2242,49 +2218,48 @@ static PyObject *bpy_bmedgeseq_new(BPy_BMElemSeq *self, PyObject *args) if (!PyArg_ParseTuple(args, "O|O!:edges.new", &vert_seq, &BPy_BMEdge_Type, &py_edge_example)) { return NULL; } - else { - BMesh *bm = self->bm; - BMEdge *e; - BMVert **vert_array = NULL; - Py_ssize_t vert_seq_len; /* always 2 */ - PyObject *ret = NULL; - if (py_edge_example) { - BPY_BM_CHECK_OBJ(py_edge_example); - } + BMesh *bm = self->bm; + BMEdge *e; + BMVert **vert_array = NULL; + Py_ssize_t vert_seq_len; /* always 2 */ + PyObject *ret = NULL; - vert_array = BPy_BMElem_PySeq_As_Array( - &bm, vert_seq, 2, 2, &vert_seq_len, BM_VERT, true, true, "edges.new(...)"); + if (py_edge_example) { + BPY_BM_CHECK_OBJ(py_edge_example); + } - if (vert_array == NULL) { - return NULL; - } + vert_array = BPy_BMElem_PySeq_As_Array( + &bm, vert_seq, 2, 2, &vert_seq_len, BM_VERT, true, true, "edges.new(...)"); - if (BM_edge_exists(vert_array[0], vert_array[1])) { - PyErr_SetString(PyExc_ValueError, "edges.new(): this edge exists"); - goto cleanup; - } + if (vert_array == NULL) { + return NULL; + } - e = BM_edge_create(bm, vert_array[0], vert_array[1], NULL, BM_CREATE_NOP); + if (BM_edge_exists(vert_array[0], vert_array[1])) { + PyErr_SetString(PyExc_ValueError, "edges.new(): this edge exists"); + goto cleanup; + } - if (e == NULL) { - PyErr_SetString(PyExc_ValueError, - "faces.new(verts): couldn't create the new face, internal error"); - goto cleanup; - } + e = BM_edge_create(bm, vert_array[0], vert_array[1], NULL, BM_CREATE_NOP); - if (py_edge_example) { - BM_elem_attrs_copy(py_edge_example->bm, bm, py_edge_example->e, e); - } + if (e == NULL) { + PyErr_SetString(PyExc_ValueError, + "faces.new(verts): couldn't create the new face, internal error"); + goto cleanup; + } - ret = BPy_BMEdge_CreatePyObject(bm, e); + if (py_edge_example) { + BM_elem_attrs_copy(py_edge_example->bm, bm, py_edge_example->e, e); + } - cleanup: - if (vert_array) { - PyMem_FREE(vert_array); - } - return ret; + ret = BPy_BMEdge_CreatePyObject(bm, e); + +cleanup: + if (vert_array) { + PyMem_FREE(vert_array); } + return ret; } /* Face Seq @@ -2310,58 +2285,57 @@ static PyObject *bpy_bmfaceseq_new(BPy_BMElemSeq *self, PyObject *args) if (!PyArg_ParseTuple(args, "O|O!:faces.new", &vert_seq, &BPy_BMFace_Type, &py_face_example)) { return NULL; } - else { - BMesh *bm = self->bm; - Py_ssize_t vert_seq_len; - BMVert **vert_array = NULL; + BMesh *bm = self->bm; + Py_ssize_t vert_seq_len; - PyObject *ret = NULL; + BMVert **vert_array = NULL; - BMFace *f_new; + PyObject *ret = NULL; - if (py_face_example) { - BPY_BM_CHECK_OBJ(py_face_example); - } + BMFace *f_new; - vert_array = BPy_BMElem_PySeq_As_Array( - &bm, vert_seq, 3, PY_SSIZE_T_MAX, &vert_seq_len, BM_VERT, true, true, "faces.new(...)"); + if (py_face_example) { + BPY_BM_CHECK_OBJ(py_face_example); + } - if (vert_array == NULL) { - return NULL; - } + vert_array = BPy_BMElem_PySeq_As_Array( + &bm, vert_seq, 3, PY_SSIZE_T_MAX, &vert_seq_len, BM_VERT, true, true, "faces.new(...)"); - /* check if the face exists */ - if (BM_face_exists(vert_array, vert_seq_len) != NULL) { - PyErr_SetString(PyExc_ValueError, "faces.new(verts): face already exists"); - goto cleanup; - } + if (vert_array == NULL) { + return NULL; + } - /* Go ahead and make the face! - * --------------------------- */ + /* check if the face exists */ + if (BM_face_exists(vert_array, vert_seq_len) != NULL) { + PyErr_SetString(PyExc_ValueError, "faces.new(verts): face already exists"); + goto cleanup; + } - f_new = BM_face_create_verts(bm, - vert_array, - vert_seq_len, - py_face_example ? py_face_example->f : NULL, - BM_CREATE_NOP, - true); + /* Go ahead and make the face! + * --------------------------- */ - if (UNLIKELY(f_new == NULL)) { - PyErr_SetString(PyExc_ValueError, - "faces.new(verts): couldn't create the new face, internal error"); - goto cleanup; - } + f_new = BM_face_create_verts(bm, + vert_array, + vert_seq_len, + py_face_example ? py_face_example->f : NULL, + BM_CREATE_NOP, + true); - ret = BPy_BMFace_CreatePyObject(bm, f_new); + if (UNLIKELY(f_new == NULL)) { + PyErr_SetString(PyExc_ValueError, + "faces.new(verts): couldn't create the new face, internal error"); + goto cleanup; + } - /* pass through */ - cleanup: - if (vert_array) { - PyMem_FREE(vert_array); - } - return ret; + ret = BPy_BMFace_CreatePyObject(bm, f_new); + + /* pass through */ +cleanup: + if (vert_array) { + PyMem_FREE(vert_array); } + return ret; } /* Elem Seq @@ -2378,16 +2352,15 @@ static PyObject *bpy_bmvertseq_remove(BPy_BMElemSeq *self, BPy_BMVert *value) if (!BPy_BMVert_Check(value)) { return NULL; } - else { - BMesh *bm = self->bm; - BPY_BM_CHECK_SOURCE_OBJ(bm, "verts.remove(vert)", value); + BMesh *bm = self->bm; - BM_vert_kill(bm, value->v); - bpy_bm_generic_invalidate((BPy_BMGeneric *)value); + BPY_BM_CHECK_SOURCE_OBJ(bm, "verts.remove(vert)", value); - Py_RETURN_NONE; - } + BM_vert_kill(bm, value->v); + bpy_bm_generic_invalidate((BPy_BMGeneric *)value); + + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmedgeseq_remove_doc, @@ -2401,16 +2374,15 @@ static PyObject *bpy_bmedgeseq_remove(BPy_BMElemSeq *self, BPy_BMEdge *value) if (!BPy_BMEdge_Check(value)) { return NULL; } - else { - BMesh *bm = self->bm; - BPY_BM_CHECK_SOURCE_OBJ(bm, "edges.remove(edges)", value); + BMesh *bm = self->bm; - BM_edge_kill(bm, value->e); - bpy_bm_generic_invalidate((BPy_BMGeneric *)value); + BPY_BM_CHECK_SOURCE_OBJ(bm, "edges.remove(edges)", value); - Py_RETURN_NONE; - } + BM_edge_kill(bm, value->e); + bpy_bm_generic_invalidate((BPy_BMGeneric *)value); + + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmfaceseq_remove_doc, @@ -2424,16 +2396,15 @@ static PyObject *bpy_bmfaceseq_remove(BPy_BMElemSeq *self, BPy_BMFace *value) if (!BPy_BMFace_Check(value)) { return NULL; } - else { - BMesh *bm = self->bm; - BPY_BM_CHECK_SOURCE_OBJ(bm, "faces.remove(face)", value); + BMesh *bm = self->bm; - BM_face_kill(bm, value->f); - bpy_bm_generic_invalidate((BPy_BMGeneric *)value); + BPY_BM_CHECK_SOURCE_OBJ(bm, "faces.remove(face)", value); - Py_RETURN_NONE; - } + BM_face_kill(bm, value->f); + bpy_bm_generic_invalidate((BPy_BMGeneric *)value); + + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bmedgeseq_get__method_doc, @@ -2456,31 +2427,30 @@ static PyObject *bpy_bmedgeseq_get__method(BPy_BMElemSeq *self, PyObject *args) if (!PyArg_ParseTuple(args, "O|O:edges.get", &vert_seq, &fallback)) { return NULL; } - else { - BMesh *bm = self->bm; - BMEdge *e; - BMVert **vert_array = NULL; - Py_ssize_t vert_seq_len; /* always 2 */ - PyObject *ret = NULL; - vert_array = BPy_BMElem_PySeq_As_Array( - &bm, vert_seq, 2, 2, &vert_seq_len, BM_VERT, true, true, "edges.get(...)"); + BMesh *bm = self->bm; + BMEdge *e; + BMVert **vert_array = NULL; + Py_ssize_t vert_seq_len; /* always 2 */ + PyObject *ret = NULL; - if (vert_array == NULL) { - return NULL; - } + vert_array = BPy_BMElem_PySeq_As_Array( + &bm, vert_seq, 2, 2, &vert_seq_len, BM_VERT, true, true, "edges.get(...)"); - if ((e = BM_edge_exists(vert_array[0], vert_array[1]))) { - ret = BPy_BMEdge_CreatePyObject(bm, e); - } - else { - ret = fallback; - Py_INCREF(ret); - } + if (vert_array == NULL) { + return NULL; + } - PyMem_FREE(vert_array); - return ret; + if ((e = BM_edge_exists(vert_array[0], vert_array[1]))) { + ret = BPy_BMEdge_CreatePyObject(bm, e); + } + else { + ret = fallback; + Py_INCREF(ret); } + + PyMem_FREE(vert_array); + return ret; } PyDoc_STRVAR(bpy_bmfaceseq_get__method_doc, @@ -2503,32 +2473,31 @@ static PyObject *bpy_bmfaceseq_get__method(BPy_BMElemSeq *self, PyObject *args) if (!PyArg_ParseTuple(args, "O|O:faces.get", &vert_seq, &fallback)) { return NULL; } - else { - BMesh *bm = self->bm; - BMFace *f = NULL; - BMVert **vert_array = NULL; - Py_ssize_t vert_seq_len; - PyObject *ret = NULL; - vert_array = BPy_BMElem_PySeq_As_Array( - &bm, vert_seq, 1, PY_SSIZE_T_MAX, &vert_seq_len, BM_VERT, true, true, "faces.get(...)"); + BMesh *bm = self->bm; + BMFace *f = NULL; + BMVert **vert_array = NULL; + Py_ssize_t vert_seq_len; + PyObject *ret = NULL; - if (vert_array == NULL) { - return NULL; - } + vert_array = BPy_BMElem_PySeq_As_Array( + &bm, vert_seq, 1, PY_SSIZE_T_MAX, &vert_seq_len, BM_VERT, true, true, "faces.get(...)"); - f = BM_face_exists(vert_array, vert_seq_len); - if (f != NULL) { - ret = BPy_BMFace_CreatePyObject(bm, f); - } - else { - ret = fallback; - Py_INCREF(ret); - } + if (vert_array == NULL) { + return NULL; + } - PyMem_FREE(vert_array); - return ret; + f = BM_face_exists(vert_array, vert_seq_len); + if (f != NULL) { + ret = BPy_BMFace_CreatePyObject(bm, f); } + else { + ret = fallback; + Py_INCREF(ret); + } + + PyMem_FREE(vert_array); + return ret; } PyDoc_STRVAR( @@ -2651,12 +2620,11 @@ static int bpy_bmelemseq_sort_cmp_by_keys_ascending(const void *index1_v, if (keys[*index1] < keys[*index2]) { return -1; } - else if (keys[*index1] > keys[*index2]) { + if (keys[*index1] > keys[*index2]) { return 1; } - else { - return 0; - } + + return 0; } static int bpy_bmelemseq_sort_cmp_by_keys_descending(const void *index1_v, @@ -3260,54 +3228,51 @@ static PyObject *bpy_bmelemseq_subscript(BPy_BMElemSeq *self, PyObject *key) } return bpy_bmelemseq_subscript_int(self, i); } - else if (PySlice_Check(key)) { + if (PySlice_Check(key)) { PySliceObject *key_slice = (PySliceObject *)key; Py_ssize_t step = 1; if (key_slice->step != Py_None && !_PyEval_SliceIndex(key, &step)) { return NULL; } - else if (step != 1) { + if (step != 1) { PyErr_SetString(PyExc_TypeError, "BMElemSeq[slice]: slice steps not supported"); return NULL; } - else if (key_slice->start == Py_None && key_slice->stop == Py_None) { + if (key_slice->start == Py_None && key_slice->stop == Py_None) { return bpy_bmelemseq_subscript_slice(self, 0, PY_SSIZE_T_MAX); } - else { - Py_ssize_t start = 0, stop = PY_SSIZE_T_MAX; - /* avoid PySlice_GetIndicesEx because it needs to know the length ahead of time. */ - if (key_slice->start != Py_None && !_PyEval_SliceIndex(key_slice->start, &start)) { - return NULL; - } - if (key_slice->stop != Py_None && !_PyEval_SliceIndex(key_slice->stop, &stop)) { - return NULL; - } + Py_ssize_t start = 0, stop = PY_SSIZE_T_MAX; - if (start < 0 || stop < 0) { - /* only get the length for negative values */ - Py_ssize_t len = bpy_bmelemseq_length(self); - if (start < 0) { - start += len; - } - if (stop < 0) { - stop += len; - } - } + /* avoid PySlice_GetIndicesEx because it needs to know the length ahead of time. */ + if (key_slice->start != Py_None && !_PyEval_SliceIndex(key_slice->start, &start)) { + return NULL; + } + if (key_slice->stop != Py_None && !_PyEval_SliceIndex(key_slice->stop, &stop)) { + return NULL; + } - if (stop - start <= 0) { - return PyList_New(0); + if (start < 0 || stop < 0) { + /* only get the length for negative values */ + Py_ssize_t len = bpy_bmelemseq_length(self); + if (start < 0) { + start += len; } - else { - return bpy_bmelemseq_subscript_slice(self, start, stop); + if (stop < 0) { + stop += len; } } + + if (stop - start <= 0) { + return PyList_New(0); + } + + return bpy_bmelemseq_subscript_slice(self, start, stop); } - else { - PyErr_SetString(PyExc_AttributeError, "BMElemSeq[key]: invalid key, key must be an int"); - return NULL; - } + + PyErr_SetString(PyExc_AttributeError, "BMElemSeq[key]: invalid key, key must be an int"); + return NULL; } static int bpy_bmelemseq_contains(BPy_BMElemSeq *self, PyObject *value) @@ -3395,9 +3360,8 @@ static PyObject *bpy_bmiter_next(BPy_BMIter *self) PyErr_SetNone(PyExc_StopIteration); return NULL; } - else { - return (PyObject *)BPy_BMElem_CreatePyObject(self->bm, ele); - } + + return (PyObject *)BPy_BMElem_CreatePyObject(self->bm, ele); } /* Dealloc Functions @@ -3532,9 +3496,8 @@ static PyObject *bpy_bmesh_repr(BPy_BMesh *self) bm->totface, bm->totloop); } - else { - return PyUnicode_FromFormat("<BMesh dead at %p>", self); - } + + return PyUnicode_FromFormat("<BMesh dead at %p>", self); } static PyObject *bpy_bmvert_repr(BPy_BMVert *self) @@ -3545,9 +3508,8 @@ static PyObject *bpy_bmvert_repr(BPy_BMVert *self) BMVert *v = self->v; return PyUnicode_FromFormat("<BMVert(%p), index=%d>", v, BM_elem_index_get(v)); } - else { - return PyUnicode_FromFormat("<BMVert dead at %p>", self); - } + + return PyUnicode_FromFormat("<BMVert dead at %p>", self); } static PyObject *bpy_bmedge_repr(BPy_BMEdge *self) @@ -3564,9 +3526,8 @@ static PyObject *bpy_bmedge_repr(BPy_BMEdge *self) e->v2, BM_elem_index_get(e->v2)); } - else { - return PyUnicode_FromFormat("<BMEdge dead at %p>", self); - } + + return PyUnicode_FromFormat("<BMEdge dead at %p>", self); } static PyObject *bpy_bmface_repr(BPy_BMFace *self) @@ -3578,9 +3539,8 @@ static PyObject *bpy_bmface_repr(BPy_BMFace *self) return PyUnicode_FromFormat( "<BMFace(%p), index=%d, totverts=%d>", f, BM_elem_index_get(f), f->len); } - else { - return PyUnicode_FromFormat("<BMFace dead at %p>", self); - } + + return PyUnicode_FromFormat("<BMFace dead at %p>", self); } static PyObject *bpy_bmloop_repr(BPy_BMLoop *self) @@ -3599,9 +3559,8 @@ static PyObject *bpy_bmloop_repr(BPy_BMLoop *self) l->f, BM_elem_index_get(l->f)); } - else { - return PyUnicode_FromFormat("<BMLoop dead at %p>", self); - } + + return PyUnicode_FromFormat("<BMLoop dead at %p>", self); } /* Types @@ -4054,12 +4013,10 @@ int bpy_bm_generic_valid_check(BPy_BMGeneric *self) return 0; } - else { - PyErr_Format(PyExc_ReferenceError, - "BMesh data of type %.200s has been removed", - Py_TYPE(self)->tp_name); - return -1; - } + + PyErr_Format( + PyExc_ReferenceError, "BMesh data of type %.200s has been removed", Py_TYPE(self)->tp_name); + return -1; } int bpy_bm_generic_valid_check_source(BMesh *bm_source, @@ -4079,16 +4036,15 @@ int bpy_bm_generic_valid_check_source(BMesh *bm_source, if (UNLIKELY(ret == -1)) { break; } - else { - if (UNLIKELY(py_bm_elem->bm != bm_source)) { - /* could give more info here */ - PyErr_Format(PyExc_ValueError, - "%.200s: BMesh data of type %.200s is from another mesh", - error_prefix, - Py_TYPE(py_bm_elem)->tp_name); - ret = -1; - break; - } + + if (UNLIKELY(py_bm_elem->bm != bm_source)) { + /* could give more info here */ + PyErr_Format(PyExc_ValueError, + "%.200s: BMesh data of type %.200s is from another mesh", + error_prefix, + Py_TYPE(py_bm_elem)->tp_name); + ret = -1; + break; } } } diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h index 74bfbcec3c7..7ac3c4bf3cc 100644 --- a/source/blender/python/bmesh/bmesh_py_types.h +++ b/source/blender/python/bmesh/bmesh_py_types.h @@ -21,8 +21,7 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_TYPES_H__ -#define __BMESH_PY_TYPES_H__ +#pragma once extern PyTypeObject BPy_BMesh_Type; extern PyTypeObject BPy_BMVert_Type; @@ -228,5 +227,3 @@ extern struct PyC_FlagSet bpy_bm_htype_vert_edge_face_flags[]; extern struct PyC_FlagSet bpy_bm_htype_all_flags[]; extern struct PyC_FlagSet bpy_bm_hflag_all_flags[]; #endif - -#endif /* __BMESH_PY_TYPES_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index 8615da653ae..51616030d30 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -67,10 +67,9 @@ static CustomDataLayer *bpy_bmlayeritem_get(BPy_BMLayerItem *self) if (index_absolute != -1) { return &data->layers[index_absolute]; } - else { - PyErr_SetString(PyExc_RuntimeError, "layer has become invalid"); - return NULL; - } + + PyErr_SetString(PyExc_RuntimeError, "layer has become invalid"); + return NULL; } /* py-type definitions @@ -142,9 +141,8 @@ static PyObject *bpy_bmlayercollection_active_get(BPy_BMLayerItem *self, void *U if (index != -1) { return BPy_BMLayerItem_CreatePyObject(self->bm, self->htype, self->type, index); } - else { - Py_RETURN_NONE; - } + + Py_RETURN_NONE; } PyDoc_STRVAR( @@ -169,9 +167,8 @@ static PyObject *bpy_bmlayeritem_name_get(BPy_BMLayerItem *self, void *UNUSED(fl if (layer) { return PyUnicode_FromString(layer->name); } - else { - return NULL; - } + + return NULL; } static PyGetSetDef bpy_bmlayeraccess_vert_getseters[] = { @@ -617,16 +614,15 @@ static PyObject *bpy_bmlayercollection_get(BPy_BMLayerCollection *self, PyObject if (!PyArg_ParseTuple(args, "s|O:get", &key, &def)) { return NULL; } - else { - CustomData *data; - int index; - data = bpy_bm_customdata_get(self->bm, self->htype); - index = CustomData_get_named_layer(data, self->type, key); /* type relative */ + CustomData *data; + int index; - if (index != -1) { - return BPy_BMLayerItem_CreatePyObject(self->bm, self->htype, self->type, index); - } + data = bpy_bm_customdata_get(self->bm, self->htype); + index = CustomData_get_named_layer(data, self->type, key); /* type relative */ + + if (index != -1) { + return BPy_BMLayerItem_CreatePyObject(self->bm, self->htype, self->type, index); } return Py_INCREF_RET(def); @@ -689,10 +685,9 @@ static PyObject *bpy_bmlayercollection_subscript_str(BPy_BMLayerCollection *self if (index != -1) { return BPy_BMLayerItem_CreatePyObject(self->bm, self->htype, self->type, index); } - else { - PyErr_Format(PyExc_KeyError, "BMLayerCollection[key]: key \"%.200s\" not found", keyname); - return NULL; - } + + PyErr_Format(PyExc_KeyError, "BMLayerCollection[key]: key \"%.200s\" not found", keyname); + return NULL; } static PyObject *bpy_bmlayercollection_subscript_int(BPy_BMLayerCollection *self, int keynum) @@ -750,62 +745,58 @@ static PyObject *bpy_bmlayercollection_subscript(BPy_BMLayerCollection *self, Py if (PyUnicode_Check(key)) { return bpy_bmlayercollection_subscript_str(self, _PyUnicode_AsString(key)); } - else if (PyIndex_Check(key)) { + if (PyIndex_Check(key)) { Py_ssize_t i = PyNumber_AsSsize_t(key, PyExc_IndexError); if (i == -1 && PyErr_Occurred()) { return NULL; } return bpy_bmlayercollection_subscript_int(self, i); } - else if (PySlice_Check(key)) { + if (PySlice_Check(key)) { PySliceObject *key_slice = (PySliceObject *)key; Py_ssize_t step = 1; if (key_slice->step != Py_None && !_PyEval_SliceIndex(key, &step)) { return NULL; } - else if (step != 1) { + if (step != 1) { PyErr_SetString(PyExc_TypeError, "BMLayerCollection[slice]: slice steps not supported"); return NULL; } - else if (key_slice->start == Py_None && key_slice->stop == Py_None) { + if (key_slice->start == Py_None && key_slice->stop == Py_None) { return bpy_bmlayercollection_subscript_slice(self, 0, PY_SSIZE_T_MAX); } - else { - Py_ssize_t start = 0, stop = PY_SSIZE_T_MAX; - /* avoid PySlice_GetIndicesEx because it needs to know the length ahead of time. */ - if (key_slice->start != Py_None && !_PyEval_SliceIndex(key_slice->start, &start)) { - return NULL; - } - if (key_slice->stop != Py_None && !_PyEval_SliceIndex(key_slice->stop, &stop)) { - return NULL; - } + Py_ssize_t start = 0, stop = PY_SSIZE_T_MAX; - if (start < 0 || stop < 0) { - /* only get the length for negative values */ - Py_ssize_t len = bpy_bmlayercollection_length(self); - if (start < 0) { - start += len; - } - if (stop < 0) { - stop += len; - } - } + /* avoid PySlice_GetIndicesEx because it needs to know the length ahead of time. */ + if (key_slice->start != Py_None && !_PyEval_SliceIndex(key_slice->start, &start)) { + return NULL; + } + if (key_slice->stop != Py_None && !_PyEval_SliceIndex(key_slice->stop, &stop)) { + return NULL; + } - if (stop - start <= 0) { - return PyTuple_New(0); + if (start < 0 || stop < 0) { + /* only get the length for negative values */ + Py_ssize_t len = bpy_bmlayercollection_length(self); + if (start < 0) { + start += len; } - else { - return bpy_bmlayercollection_subscript_slice(self, start, stop); + if (stop < 0) { + stop += len; } } + + if (stop - start <= 0) { + return PyTuple_New(0); + } + + return bpy_bmlayercollection_subscript_slice(self, start, stop); } - else { - PyErr_SetString(PyExc_AttributeError, - "BMLayerCollection[key]: invalid key, key must be an int"); - return NULL; - } + + PyErr_SetString(PyExc_AttributeError, "BMLayerCollection[key]: invalid key, key must be an int"); + return NULL; } static int bpy_bmlayercollection_contains(BPy_BMLayerCollection *self, PyObject *value) @@ -1024,11 +1015,11 @@ static void *bpy_bmlayeritem_ptr_get(BPy_BMElem *py_ele, BPy_BMLayerItem *py_lay PyErr_SetString(PyExc_AttributeError, "BMElem[key]: invalid key, must be a BMLayerItem"); return NULL; } - else if (UNLIKELY(py_ele->bm != py_layer->bm)) { + if (UNLIKELY(py_ele->bm != py_layer->bm)) { PyErr_SetString(PyExc_ValueError, "BMElem[layer]: layer is from another mesh"); return NULL; } - else if (UNLIKELY(ele->head.htype != py_layer->htype)) { + if (UNLIKELY(ele->head.htype != py_layer->htype)) { char namestr_1[32], namestr_2[32]; PyErr_Format(PyExc_ValueError, "Layer/Element type mismatch, expected %.200s got layer type %.200s", @@ -1046,9 +1037,8 @@ static void *bpy_bmlayeritem_ptr_get(BPy_BMElem *py_ele, BPy_BMLayerItem *py_lay PyErr_SetString(PyExc_KeyError, "BMElem[key]: layer not found"); return NULL; } - else { - return value; - } + + return value; } /** diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.h b/source/blender/python/bmesh/bmesh_py_types_customdata.h index 95836707e3d..3173813a912 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.h +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.h @@ -21,8 +21,7 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_TYPES_CUSTOMDATA_H__ -#define __BMESH_PY_TYPES_CUSTOMDATA_H__ +#pragma once /* all use BPy_BMLayerAccess struct */ extern PyTypeObject BPy_BMLayerAccessVert_Type; @@ -67,5 +66,3 @@ void BPy_BM_init_types_customdata(void); /* __getitem__ / __setitem__ */ PyObject *BPy_BMLayerItem_GetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer); int BPy_BMLayerItem_SetItem(BPy_BMElem *py_ele, BPy_BMLayerItem *py_layer, PyObject *value); - -#endif /* __BMESH_PY_TYPES_CUSTOMDATA_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 82b6cf5c3d5..f42348975c9 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -65,9 +65,8 @@ static int bpy_bmloopuv_uv_set(BPy_BMLoopUV *self, PyObject *value, void *UNUSED copy_v2_v2(self->data->uv, tvec); return 0; } - else { - return -1; - } + + return -1; } PyDoc_STRVAR(bpy_bmloopuv_flag__pin_uv_doc, "UV pin state.\n\n:type: boolean"); @@ -136,10 +135,9 @@ int BPy_BMLoopUV_AssignPyObject(struct MLoopUV *mloopuv, PyObject *value) PyErr_Format(PyExc_TypeError, "expected BMLoopUV, not a %.200s", Py_TYPE(value)->tp_name); return -1; } - else { - *((MLoopUV *)mloopuv) = *(((BPy_BMLoopUV *)value)->data); - return 0; - } + + *((MLoopUV *)mloopuv) = *(((BPy_BMLoopUV *)value)->data); + return 0; } PyObject *BPy_BMLoopUV_CreatePyObject(struct MLoopUV *mloopuv) @@ -174,9 +172,8 @@ static int bpy_bmvertskin_radius_set(BPy_BMVertSkin *self, PyObject *value, void copy_v2_v2(self->data->radius, tvec); return 0; } - else { - return -1; - } + + return -1; } PyDoc_STRVAR(bpy_bmvertskin_flag__use_root_doc, @@ -251,10 +248,9 @@ int BPy_BMVertSkin_AssignPyObject(struct MVertSkin *mvertskin, PyObject *value) PyErr_Format(PyExc_TypeError, "expected BMVertSkin, not a %.200s", Py_TYPE(value)->tp_name); return -1; } - else { - *((MVertSkin *)mvertskin) = *(((BPy_BMVertSkin *)value)->data); - return 0; - } + + *((MVertSkin *)mvertskin) = *(((BPy_BMVertSkin *)value)->data); + return 0; } PyObject *BPy_BMVertSkin_CreatePyObject(struct MVertSkin *mvertskin) @@ -351,9 +347,8 @@ int BPy_BMLoopColor_AssignPyObject(struct MLoopCol *mloopcol, PyObject *value) mloopcol_from_float(mloopcol, tvec); return 0; } - else { - return -1; - } + + return -1; } PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *data) @@ -416,25 +411,22 @@ static PyObject *bpy_bmdeformvert_subscript(BPy_BMDeformVert *self, PyObject *ke if (i == -1 && PyErr_Occurred()) { return NULL; } - else { - MDeformWeight *dw = BKE_defvert_find_index(self->data, i); - if (dw == NULL) { - PyErr_SetString(PyExc_KeyError, - "BMDeformVert[key] = x: " - "key not found"); - return NULL; - } - else { - return PyFloat_FromDouble(dw->weight); - } + MDeformWeight *dw = BKE_defvert_find_index(self->data, i); + + if (dw == NULL) { + PyErr_SetString(PyExc_KeyError, + "BMDeformVert[key] = x: " + "key not found"); + return NULL; } + + return PyFloat_FromDouble(dw->weight); } - else { - PyErr_Format( - PyExc_TypeError, "BMDeformVert keys must be integers, not %.200s", Py_TYPE(key)->tp_name); - return NULL; - } + + PyErr_Format( + PyExc_TypeError, "BMDeformVert keys must be integers, not %.200s", Py_TYPE(key)->tp_name); + return NULL; } static int bpy_bmdeformvert_ass_subscript(BPy_BMDeformVert *self, PyObject *key, PyObject *value) @@ -455,18 +447,17 @@ static int bpy_bmdeformvert_ass_subscript(BPy_BMDeformVert *self, PyObject *key, "weight keys can't be negative"); return -1; } - else { - MDeformWeight *dw = BKE_defvert_ensure_index(self->data, i); - const float f = PyFloat_AsDouble(value); - if (f == -1 && PyErr_Occurred()) { // parsed key not a number - PyErr_SetString(PyExc_TypeError, - "BMDeformVert[key] = x: " - "assigned value not a number"); - return -1; - } - - dw->weight = clamp_f(f, 0.0f, 1.0f); + + MDeformWeight *dw = BKE_defvert_ensure_index(self->data, i); + const float f = PyFloat_AsDouble(value); + if (f == -1 && PyErr_Occurred()) { // parsed key not a number + PyErr_SetString(PyExc_TypeError, + "BMDeformVert[key] = x: " + "assigned value not a number"); + return -1; } + + dw->weight = clamp_f(f, 0.0f, 1.0f); } else { /* del dvert[group_index] */ @@ -482,11 +473,10 @@ static int bpy_bmdeformvert_ass_subscript(BPy_BMDeformVert *self, PyObject *key, return 0; } - else { - PyErr_Format( - PyExc_TypeError, "BMDeformVert keys must be integers, not %.200s", Py_TYPE(key)->tp_name); - return -1; - } + + PyErr_Format( + PyExc_TypeError, "BMDeformVert keys must be integers, not %.200s", Py_TYPE(key)->tp_name); + return -1; } static int bpy_bmdeformvert_contains(BPy_BMDeformVert *self, PyObject *value) @@ -616,16 +606,14 @@ static PyObject *bpy_bmdeformvert_get(BPy_BMDeformVert *self, PyObject *args) if (!PyArg_ParseTuple(args, "i|O:get", &key, &def)) { return NULL; } - else { - MDeformWeight *dw = BKE_defvert_find_index(self->data, key); - if (dw) { - return PyFloat_FromDouble(dw->weight); - } - else { - return Py_INCREF_RET(def); - } + MDeformWeight *dw = BKE_defvert_find_index(self->data, key); + + if (dw) { + return PyFloat_FromDouble(dw->weight); } + + return Py_INCREF_RET(def); } PyDoc_STRVAR(bpy_bmdeformvert_clear_doc, @@ -675,13 +663,12 @@ int BPy_BMDeformVert_AssignPyObject(struct MDeformVert *dvert, PyObject *value) PyErr_Format(PyExc_TypeError, "expected BMDeformVert, not a %.200s", Py_TYPE(value)->tp_name); return -1; } - else { - MDeformVert *dvert_src = ((BPy_BMDeformVert *)value)->data; - if (LIKELY(dvert != dvert_src)) { - BKE_defvert_copy(dvert, dvert_src); - } - return 0; + + MDeformVert *dvert_src = ((BPy_BMDeformVert *)value)->data; + if (LIKELY(dvert != dvert_src)) { + BKE_defvert_copy(dvert, dvert_src); } + return 0; } PyObject *BPy_BMDeformVert_CreatePyObject(struct MDeformVert *dvert) diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.h b/source/blender/python/bmesh/bmesh_py_types_meshdata.h index 5211c30ec7e..58f31a9807e 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.h +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.h @@ -21,8 +21,7 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_TYPES_MESHDATA_H__ -#define __BMESH_PY_TYPES_MESHDATA_H__ +#pragma once extern PyTypeObject BPy_BMLoopUV_Type; extern PyTypeObject BPy_BMDeformVert_Type; @@ -51,5 +50,3 @@ int BPy_BMDeformVert_AssignPyObject(struct MDeformVert *dvert, PyObject *value); PyObject *BPy_BMDeformVert_CreatePyObject(struct MDeformVert *dvert); void BPy_BM_init_types_meshdata(void); - -#endif /* __BMESH_PY_TYPES_MESHDATA_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_types_select.c b/source/blender/python/bmesh/bmesh_py_types_select.c index 5e064453a04..d69668341ff 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.c +++ b/source/blender/python/bmesh/bmesh_py_types_select.c @@ -51,9 +51,8 @@ static PyObject *bpy_bmeditselseq_active_get(BPy_BMEditSelSeq *self, void *UNUSE if ((ese = self->bm->selected.last)) { return BPy_BMElem_CreatePyObject(self->bm, &ese->ele->head); } - else { - Py_RETURN_NONE; - } + + Py_RETURN_NONE; } static PyGetSetDef bpy_bmeditselseq_getseters[] = { @@ -196,10 +195,9 @@ static PyObject *bpy_bmeditselseq_subscript_int(BPy_BMEditSelSeq *self, int keyn if (ese) { return BPy_BMElem_CreatePyObject(self->bm, &ese->ele->head); } - else { - PyErr_Format(PyExc_IndexError, "BMElemSeq[index]: index %d out of range", keynum); - return NULL; - } + + PyErr_Format(PyExc_IndexError, "BMElemSeq[index]: index %d out of range", keynum); + return NULL; } static PyObject *bpy_bmeditselseq_subscript_slice(BPy_BMEditSelSeq *self, @@ -254,54 +252,51 @@ static PyObject *bpy_bmeditselseq_subscript(BPy_BMEditSelSeq *self, PyObject *ke } return bpy_bmeditselseq_subscript_int(self, i); } - else if (PySlice_Check(key)) { + if (PySlice_Check(key)) { PySliceObject *key_slice = (PySliceObject *)key; Py_ssize_t step = 1; if (key_slice->step != Py_None && !_PyEval_SliceIndex(key, &step)) { return NULL; } - else if (step != 1) { + if (step != 1) { PyErr_SetString(PyExc_TypeError, "BMElemSeq[slice]: slice steps not supported"); return NULL; } - else if (key_slice->start == Py_None && key_slice->stop == Py_None) { + if (key_slice->start == Py_None && key_slice->stop == Py_None) { return bpy_bmeditselseq_subscript_slice(self, 0, PY_SSIZE_T_MAX); } - else { - Py_ssize_t start = 0, stop = PY_SSIZE_T_MAX; - /* avoid PySlice_GetIndicesEx because it needs to know the length ahead of time. */ - if (key_slice->start != Py_None && !_PyEval_SliceIndex(key_slice->start, &start)) { - return NULL; - } - if (key_slice->stop != Py_None && !_PyEval_SliceIndex(key_slice->stop, &stop)) { - return NULL; - } + Py_ssize_t start = 0, stop = PY_SSIZE_T_MAX; - if (start < 0 || stop < 0) { - /* only get the length for negative values */ - Py_ssize_t len = bpy_bmeditselseq_length(self); - if (start < 0) { - start += len; - } - if (stop < 0) { - stop += len; - } - } + /* avoid PySlice_GetIndicesEx because it needs to know the length ahead of time. */ + if (key_slice->start != Py_None && !_PyEval_SliceIndex(key_slice->start, &start)) { + return NULL; + } + if (key_slice->stop != Py_None && !_PyEval_SliceIndex(key_slice->stop, &stop)) { + return NULL; + } - if (stop - start <= 0) { - return PyList_New(0); + if (start < 0 || stop < 0) { + /* only get the length for negative values */ + Py_ssize_t len = bpy_bmeditselseq_length(self); + if (start < 0) { + start += len; } - else { - return bpy_bmeditselseq_subscript_slice(self, start, stop); + if (stop < 0) { + stop += len; } } + + if (stop - start <= 0) { + return PyList_New(0); + } + + return bpy_bmeditselseq_subscript_slice(self, start, stop); } - else { - PyErr_SetString(PyExc_AttributeError, "BMElemSeq[key]: invalid key, key must be an int"); - return NULL; - } + + PyErr_SetString(PyExc_AttributeError, "BMElemSeq[key]: invalid key, key must be an int"); + return NULL; } static int bpy_bmeditselseq_contains(BPy_BMEditSelSeq *self, PyObject *value) @@ -358,10 +353,9 @@ static PyObject *bpy_bmeditseliter_next(BPy_BMEditSelIter *self) PyErr_SetNone(PyExc_StopIteration); return NULL; } - else { - self->ese = ese->next; - return (PyObject *)BPy_BMElem_CreatePyObject(self->bm, &ese->ele->head); - } + + self->ese = ese->next; + return (PyObject *)BPy_BMElem_CreatePyObject(self->bm, &ese->ele->head); } PyTypeObject BPy_BMEditSelSeq_Type; diff --git a/source/blender/python/bmesh/bmesh_py_types_select.h b/source/blender/python/bmesh/bmesh_py_types_select.h index 593857a5083..c33aa3675c5 100644 --- a/source/blender/python/bmesh/bmesh_py_types_select.h +++ b/source/blender/python/bmesh/bmesh_py_types_select.h @@ -21,8 +21,7 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_TYPES_SELECT_H__ -#define __BMESH_PY_TYPES_SELECT_H__ +#pragma once struct BPy_BMesh; @@ -46,5 +45,3 @@ void BPy_BM_init_types_select(void); PyObject *BPy_BMEditSel_CreatePyObject(BMesh *bm); PyObject *BPy_BMEditSelIter_CreatePyObject(BMesh *bm); int BPy_BMEditSel_Assign(struct BPy_BMesh *self, PyObject *value); - -#endif /* __BMESH_PY_SELECT_H__ */ diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index 9b207693e37..eab9ab226e4 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -91,11 +91,10 @@ static PyObject *bpy_bm_utils_vert_collapse_edge(PyObject *UNUSED(self), PyObjec if (e_new) { return BPy_BMEdge_CreatePyObject(bm, e_new); } - else { - PyErr_SetString(PyExc_ValueError, - "vert_collapse_edge(vert, edge): no new edge created, internal error"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, + "vert_collapse_edge(vert, edge): no new edge created, internal error"); + return NULL; } PyDoc_STRVAR(bpy_bm_utils_vert_collapse_faces_doc, @@ -158,11 +157,10 @@ static PyObject *bpy_bm_utils_vert_collapse_faces(PyObject *UNUSED(self), PyObje if (e_new) { return BPy_BMEdge_CreatePyObject(bm, e_new); } - else { - PyErr_SetString(PyExc_ValueError, - "vert_collapse_faces(vert, edge): no new edge created, internal error"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, + "vert_collapse_faces(vert, edge): no new edge created, internal error"); + return NULL; } PyDoc_STRVAR(bpy_bm_utils_vert_dissolve_doc, @@ -360,11 +358,10 @@ static PyObject *bpy_bm_utils_edge_split(PyObject *UNUSED(self), PyObject *args) ret, BPy_BMEdge_CreatePyObject(bm, e_new), BPy_BMVert_CreatePyObject(bm, v_new)); return ret; } - else { - PyErr_SetString(PyExc_ValueError, - "edge_split(edge, vert): couldn't split the edge, internal error"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, + "edge_split(edge, vert): couldn't split the edge, internal error"); + return NULL; } PyDoc_STRVAR(bpy_bm_utils_edge_rotate_doc, @@ -401,9 +398,8 @@ static PyObject *bpy_bm_utils_edge_rotate(PyObject *UNUSED(self), PyObject *args if (e_new) { return BPy_BMEdge_CreatePyObject(bm, e_new); } - else { - Py_RETURN_NONE; - } + + Py_RETURN_NONE; } PyDoc_STRVAR( @@ -534,10 +530,9 @@ static PyObject *bpy_bm_utils_face_split(PyObject *UNUSED(self), PyObject *args, ret, BPy_BMFace_CreatePyObject(bm, f_new), BPy_BMLoop_CreatePyObject(bm, l_new)); return ret; } - else { - PyErr_SetString(PyExc_ValueError, "face_split(...): couldn't split the face, internal error"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, "face_split(...): couldn't split the face, internal error"); + return NULL; } PyDoc_STRVAR(bpy_bm_utils_face_split_edgenet_doc, @@ -617,11 +612,10 @@ static PyObject *bpy_bm_utils_face_split_edgenet(PyObject *UNUSED(self), } return ret; } - else { - PyErr_SetString(PyExc_ValueError, - "face_split_edgenet(...): couldn't split the face, internal error"); - return NULL; - } + + PyErr_SetString(PyExc_ValueError, + "face_split_edgenet(...): couldn't split the face, internal error"); + return NULL; } PyDoc_STRVAR(bpy_bm_utils_face_join_doc, @@ -664,9 +658,8 @@ static PyObject *bpy_bm_utils_face_join(PyObject *UNUSED(self), PyObject *args) if (f_new) { return BPy_BMFace_CreatePyObject(bm, f_new); } - else { - Py_RETURN_NONE; - } + + Py_RETURN_NONE; } PyDoc_STRVAR( @@ -721,9 +714,8 @@ static PyObject *bpy_bm_utils_face_vert_separate(PyObject *UNUSED(self), PyObjec if (v_new != v_old) { return BPy_BMVert_CreatePyObject(bm, v_new); } - else { - Py_RETURN_NONE; - } + + Py_RETURN_NONE; } PyDoc_STRVAR(bpy_bm_utils_face_flip_doc, @@ -782,9 +774,8 @@ static PyObject *bpy_bm_utils_loop_separate(PyObject *UNUSED(self), BPy_BMLoop * if (v_new != v_old) { return BPy_BMVert_CreatePyObject(bm, v_new); } - else { - Py_RETURN_NONE; - } + + Py_RETURN_NONE; } static struct PyMethodDef BPy_BM_utils_methods[] = { diff --git a/source/blender/python/bmesh/bmesh_py_utils.h b/source/blender/python/bmesh/bmesh_py_utils.h index a6f4f22bf8b..27eccca4535 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.h +++ b/source/blender/python/bmesh/bmesh_py_utils.h @@ -21,9 +21,6 @@ * \ingroup pybmesh */ -#ifndef __BMESH_PY_UTILS_H__ -#define __BMESH_PY_UTILS_H__ +#pragma once PyObject *BPyInit_bmesh_utils(void); - -#endif /* __BMESH_PY_UTILS_H__ */ |