Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-05-17 16:43:58 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-17 16:43:58 +0400
commit88d1067f58298b14d1ee47b4a3abbaec52208bf8 (patch)
tree7110738eab13a01fe32c256045f1b72fd1edfaf6
parent43748eca2d72af87fb7468b6ba9cbeeb57888137 (diff)
code cleanup: use BM_elem_flag_test rather then accessing 'ele->head.hflag'
-rw-r--r--source/blender/editors/object/object_modifier.c6
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c4
-rw-r--r--source/blender/makesrna/intern/rna_access.c2
-rw-r--r--source/blender/python/bmesh/bmesh_py_types.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index c4b2f6c515b..b1f1f73f493 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -1527,7 +1527,7 @@ static int skin_root_mark_exec(bContext *C, wmOperator *UNUSED(op))
BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
if (!BLI_ghash_lookup(visited, bm_vert) &&
- bm_vert->head.hflag & BM_ELEM_SELECT)
+ BM_elem_flag_test(bm_vert, BM_ELEM_SELECT))
{
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
bm_vert->head.data,
@@ -1582,7 +1582,7 @@ static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op)
}
BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
- if (bm_vert->head.hflag & BM_ELEM_SELECT) {
+ if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) {
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
bm_vert->head.data,
CD_MVERT_SKIN);
@@ -1639,7 +1639,7 @@ static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op))
}
BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
- if (bm_vert->head.hflag & BM_ELEM_SELECT) {
+ if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) {
MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
bm_vert->head.data,
CD_MVERT_SKIN);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index ad94a74157d..c8fb0701d32 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1383,7 +1383,7 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d)
if (PSFRA < PEFRA) {
glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
- glRectf((float)(PEFRA+1), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+ glRectf((float)(PEFRA + 1), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
}
else {
glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
@@ -1392,7 +1392,7 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d)
UI_ThemeColorShade(TH_BACK, -60);
/* thin lines where the actual frames are */
fdrawline((float)PSFRA, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
- fdrawline((float)(PEFRA+1), v2d->cur.ymin, (float)(PEFRA+1), v2d->cur.ymax);
+ fdrawline((float)(PEFRA + 1), v2d->cur.ymin, (float)(PEFRA + 1), v2d->cur.ymax);
glDisable(GL_BLEND);
}
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 32aeaebee58..af5de0f469e 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -5023,7 +5023,7 @@ char *RNA_pointer_as_string(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *p
/* context and ptr_default can be NULL */
char *RNA_pointer_as_string_keywords_ex(bContext *C, PointerRNA *ptr, PointerRNA *ptr_default,
const short as_function, const short all_args,
- const int max_prop_length,
+ const int max_prop_length,
PropertyRNA *iterprop)
{
const char *arg_name = NULL;
diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c
index e6f9958d1d1..23631017256 100644
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -1171,7 +1171,7 @@ static PyObject *bpy_bmesh_transform(BPy_BMElem *self, PyObject *args, PyObject
else {
char filter_flags_ch = (char)filter_flags;
BM_ITER_MESH (eve, &iter, self->bm, BM_VERTS_OF_MESH) {
- if (eve->head.hflag & filter_flags_ch) {
+ if (BM_elem_flag_test(eve, filter_flags_ch)) {
mul_m4_v3((float (*)[4])mat_ptr, eve->co);
}
}