diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-26 02:23:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-26 02:23:40 +0400 |
| commit | c65b3b73fd2c0c0011ef36d8fc36301de4a42fe0 (patch) | |
| tree | 3a45d161d5814bf403ffa9093a2d417b6f7a960e /source/blender/bmesh/operators/bmo_mesh_conv.c | |
| parent | 72e1316dc4b607440430779d78a26a76a4527c4b (diff) | |
bmesh api cleanup
* better type safety for BM_elem_flag_* and BM_elem_index_* functions.
* add BMElem type to be used where BMFace/Edge/Vert/Loop can be interchanged.
* fix bug in select manifold, found when making functions more strict.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_mesh_conv.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_mesh_conv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c index 2f47104476b..b5807f9ba8d 100644 --- a/source/blender/bmesh/operators/bmo_mesh_conv.c +++ b/source/blender/bmesh/operators/bmo_mesh_conv.c @@ -331,13 +331,13 @@ void mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) if (me->mselect) { for (i = 0; i < me->totselect; i++) { if (me->mselect[i].type == ME_VSEL) { - BM_select_history_store(bm, vertex_array[me->mselect[i].index]); + BM_select_history_store(bm, (BMElem *)vertex_array[me->mselect[i].index]); } else if (me->mselect[i].type == ME_ESEL) { - BM_select_history_store(bm, edge_array[me->mselect[i].index]); + BM_select_history_store(bm, (BMElem *)edge_array[me->mselect[i].index]); } else if (me->mselect[i].type == ME_FSEL) { - BM_select_history_store(bm, face_array[me->mselect[i].index]); + BM_select_history_store(bm, (BMElem *)face_array[me->mselect[i].index]); } } } @@ -674,7 +674,7 @@ void bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) me->mselect[i].type = ME_FSEL; } - me->mselect[i].index = BM_elem_index_get(selected->data); + me->mselect[i].index = BM_elem_index_get(selected->ele); } } |