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

remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros had unused args in both cases).

Browse Source
This commit is contained in:
Campbell Barton
2012-04-19 13:47:58 +00:00
parent 9276d7aeb2
commit 475ecbb0ce
72 changed files with 727 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/bmesh/bmesh_py_types.c
View File

@@ -998,13 +998,13 @@ static PyObject *bpy_bmesh_transform(BPy_BMElem *self, PyObject *args, PyObject
mat_ptr = mat->matrix;
if (!filter_flags) {
BM_ITER (eve, &iter, self->bm, BM_VERTS_OF_MESH, NULL) {
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 (eve, &iter, self->bm, BM_VERTS_OF_MESH, NULL) {
BM_ITER_MESH (eve, &iter, self->bm, BM_VERTS_OF_MESH) {
if (eve->head.hflag & filter_flags_ch) {
mul_m4_v3((float (*)[4])mat_ptr, eve->co);
}

17
source/blender/python/bmesh/bmesh_py_types.h
View File

@@ -138,8 +138,8 @@ void BPy_BM_init_types(void);
PyObject *BPyInit_bmesh_types(void);
enum {
BPY_BMFLAG_NOP = 0, /* do nothing */
BPY_BMFLAG_IS_WRAPPED = 1 /* the mesh is owned by editmode */
BPY_BMFLAG_NOP = 0, /* do nothing */
BPY_BMFLAG_IS_WRAPPED = 1 /* the mesh is owned by editmode */
};
PyObject *BPy_BMesh_CreatePyObject(BMesh *bm, int flag);
@@ -175,8 +175,15 @@ char *BPy_BMElem_StringFromHType(const char htype);
#define BPY_BM_IS_VALID(obj) (LIKELY((obj)->bm != NULL))
#define BM_ITER_BPY_BM_SEQ(ele, iter, bpy_bmelemseq) \
BM_ITER (ele, iter, (bpy_bmelemseq)->bm, (bpy_bmelemseq)->itype, \
(bpy_bmelemseq)->py_ele ? ((BPy_BMElem *)(bpy_bmelemseq)->py_ele)->ele : NULL)
#define BM_ITER_BPY_BM_SEQ(ele, iter, bpy_bmelemseq) \
for (ele = BM_iter_new(iter, \
(bpy_bmelemseq)->bm, \
(bpy_bmelemseq)->itype, \
(bpy_bmelemseq)->py_ele ? \
((BPy_BMElem *)(bpy_bmelemseq)->py_ele)->ele : \
NULL \
); \
ele; \
ele = BM_iter_step(iter))
#endif /* __BMESH_TYPES_H__ */