diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-07-20 13:49:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-20 13:49:54 +0400 |
commit | c8db1e832d26e7b34ace2f36ff66b40d1195cb7c (patch) | |
tree | ba5f3b9d505bc422a09d45c1bbd7cac465e42324 | |
parent | 88cf37e9bcb576c7192ec9e0f52caf7fda81d2d4 (diff) |
minor edits for bmesh api
-rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.c | 11 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.h | 1 | ||||
-rw-r--r-- | source/blender/editors/include/ED_mesh.h | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select.c | 13 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.c | 8 |
6 files changed, 23 insertions, 20 deletions
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 4588fbae383..d16dacaf5cf 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -71,7 +71,7 @@ static void recount_totsels(BMesh *bm) * (ie: all verts of an edge selects the edge and so on). * This should only be called by system and not tool authors. */ -void BM_mesh_select_mode_flush(BMesh *bm) +void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode) { BMEdge *e; BMLoop *l_iter; @@ -83,7 +83,7 @@ void BM_mesh_select_mode_flush(BMesh *bm) int ok; - if (bm->selectmode & SCE_SELECT_VERTEX) { + if (selectmode & SCE_SELECT_VERTEX) { BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) && BM_elem_flag_test(e->v2, BM_ELEM_SELECT) && @@ -113,7 +113,7 @@ void BM_mesh_select_mode_flush(BMesh *bm) BM_elem_flag_set(f, BM_ELEM_SELECT, ok); } } - else if (bm->selectmode & SCE_SELECT_EDGE) { + else if (selectmode & SCE_SELECT_EDGE) { BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { ok = TRUE; if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { @@ -139,6 +139,11 @@ void BM_mesh_select_mode_flush(BMesh *bm) recount_totsels(bm); } +void BM_mesh_select_mode_flush(BMesh *bm) +{ + BM_mesh_select_mode_flush_ex(bm, bm->selectmode); +} + /** * mode independent flushing up/down */ diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h index 406971652dc..9b73ed2c390 100644 --- a/source/blender/bmesh/intern/bmesh_marking.h +++ b/source/blender/bmesh/intern/bmesh_marking.h @@ -60,6 +60,7 @@ void BM_edge_select_set(BMesh *bm, BMEdge *e, int select); void BM_face_select_set(BMesh *bm, BMFace *f, int select); void BM_mesh_select_mode_set(BMesh *bm, int selectmode); +void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode); void BM_mesh_select_mode_flush(BMesh *bm); void BM_mesh_deselect_flush(BMesh *bm); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index b2e8ecd09c9..35284b26d29 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -104,14 +104,14 @@ struct BMFace *EDBM_face_at_index(struct BMEditMesh *em, int index); void EDBM_select_more(struct BMEditMesh *em); void EDBM_select_less(struct BMEditMesh *em); -void EDBM_selectmode_flush_ex(struct BMEditMesh *em, int selectmode); +void EDBM_selectmode_flush_ex(struct BMEditMesh *em, const short selectmode); void EDBM_selectmode_flush(struct BMEditMesh *em); void EDBM_deselect_flush(struct BMEditMesh *em); void EDBM_select_flush(struct BMEditMesh *em); void EDBM_selectmode_set(struct BMEditMesh *em); -void EDBM_selectmode_convert(struct BMEditMesh *em, short oldmode, short selectmode); +void EDBM_selectmode_convert(struct BMEditMesh *em, short oldmode, const short selectmode); void undo_push_mesh(struct bContext *C, const char *name); int EDBM_vert_color_check(struct BMEditMesh *em); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index a9912b90aef..61d12b751e0 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -1682,15 +1682,15 @@ void EDBM_selectmode_set(BMEditMesh *em) } } -void EDBM_selectmode_convert(BMEditMesh *em, short oldmode, short selectmode) +void EDBM_selectmode_convert(BMEditMesh *em, const short selectmode_old, const short selectmode_new) { BMEdge *eed; BMFace *efa; BMIter iter; /* have to find out what the selectionmode was previously */ - if (oldmode == SCE_SELECT_VERTEX) { - if (selectmode == SCE_SELECT_EDGE) { + if (selectmode_old == SCE_SELECT_VERTEX) { + if (selectmode_new == SCE_SELECT_EDGE) { /* select all edges associated with every selected vertex */ eed = BM_iter_new(&iter, em->bm, BM_EDGES_OF_MESH, NULL); for (; eed; eed = BM_iter_step(&iter)) { @@ -1701,7 +1701,7 @@ void EDBM_selectmode_convert(BMEditMesh *em, short oldmode, short selectmode) } } } - else if (selectmode == SCE_SELECT_FACE) { + else if (selectmode_new == SCE_SELECT_FACE) { BMIter liter; BMLoop *l; @@ -1718,9 +1718,8 @@ void EDBM_selectmode_convert(BMEditMesh *em, short oldmode, short selectmode) } } } - - if (oldmode == SCE_SELECT_EDGE) { - if (selectmode == SCE_SELECT_FACE) { + else if (selectmode_old == SCE_SELECT_EDGE) { + if (selectmode_new == SCE_SELECT_FACE) { BMIter liter; BMLoop *l; diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index 4952dd3f09a..274789a7b96 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -452,11 +452,9 @@ BMFace *EDBM_face_at_index(BMEditMesh *tm, int index) return (tm->face_index && index < tm->bm->totface && index >= 0) ? tm->face_index[index] : NULL; } -void EDBM_selectmode_flush_ex(BMEditMesh *em, int selectmode) +void EDBM_selectmode_flush_ex(BMEditMesh *em, const short selectmode) { - em->bm->selectmode = selectmode; - BM_mesh_select_mode_flush(em->bm); - em->bm->selectmode = em->selectmode; + BM_mesh_select_mode_flush_ex(em->bm, selectmode); } void EDBM_selectmode_flush(BMEditMesh *em) diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 7bcf6ba58f1..6aee12c4b41 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -170,12 +170,12 @@ void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy) if (t->options & CTX_MASK) { /* clamp w/h, mask only */ if (mulx / divx < muly / divy) { - divx = divy = divx; - mulx = muly = mulx; + divy = divx; + muly = mulx; } else { - divx = divy = divy; - mulx = muly = muly; + divx = divy; + mulx = muly; } } |