diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-02 16:16:23 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-02 16:16:23 +0400 |
commit | d17a8639e411a217c08e3ff1a93037c9350d5ec6 (patch) | |
tree | 9804b52d09b66ae02c7f69d164047d0a9d48ec06 /source/blender/bmesh | |
parent | 7d5c51a96f28b332093684a6236778bc0a0738ec (diff) |
Added typecasts to keep c++ from reporting errors
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_iterators_inline.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.h index eef6544be89..faa109617d5 100644 --- a/source/blender/bmesh/intern/bmesh_iterators_inline.h +++ b/source/blender/bmesh/intern/bmesh_iterators_inline.h @@ -80,61 +80,61 @@ BLI_INLINE bool BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *da BLI_assert(data != NULL); iter->begin = bmiter__edge_of_vert_begin; iter->step = bmiter__edge_of_vert_step; - iter->vdata = data; + iter->vdata = (BMVert *)data; break; case BM_FACES_OF_VERT: BLI_assert(data != NULL); iter->begin = bmiter__face_of_vert_begin; iter->step = bmiter__face_of_vert_step; - iter->vdata = data; + iter->vdata = (BMVert *)data; break; case BM_LOOPS_OF_VERT: BLI_assert(data != NULL); iter->begin = bmiter__loop_of_vert_begin; iter->step = bmiter__loop_of_vert_step; - iter->vdata = data; + iter->vdata = (BMVert *)data; break; case BM_VERTS_OF_EDGE: BLI_assert(data != NULL); iter->begin = bmiter__vert_of_edge_begin; iter->step = bmiter__vert_of_edge_step; - iter->edata = data; + iter->edata = (BMEdge *)data; break; case BM_FACES_OF_EDGE: BLI_assert(data != NULL); iter->begin = bmiter__face_of_edge_begin; iter->step = bmiter__face_of_edge_step; - iter->edata = data; + iter->edata = (BMEdge *)data; break; case BM_VERTS_OF_FACE: BLI_assert(data != NULL); iter->begin = bmiter__vert_of_face_begin; iter->step = bmiter__vert_of_face_step; - iter->pdata = data; + iter->pdata = (BMFace *)data; break; case BM_EDGES_OF_FACE: BLI_assert(data != NULL); iter->begin = bmiter__edge_of_face_begin; iter->step = bmiter__edge_of_face_step; - iter->pdata = data; + iter->pdata = (BMFace *)data; break; case BM_LOOPS_OF_FACE: BLI_assert(data != NULL); iter->begin = bmiter__loop_of_face_begin; iter->step = bmiter__loop_of_face_step; - iter->pdata = data; + iter->pdata = (BMFace *)data; break; case BM_LOOPS_OF_LOOP: BLI_assert(data != NULL); iter->begin = bmiter__loops_of_loop_begin; iter->step = bmiter__loops_of_loop_step; - iter->ldata = data; + iter->ldata = (BMLoop *)data; break; case BM_LOOPS_OF_EDGE: BLI_assert(data != NULL); iter->begin = bmiter__loops_of_edge_begin; iter->step = bmiter__loops_of_edge_step; - iter->edata = data; + iter->edata = (BMEdge *)data; break; default: /* should never happen */ |