diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:26:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:42:28 +0300 |
| commit | aab4f2b76253936d1ba09562f1b1a21661860bf7 (patch) | |
| tree | e558b355cd2fc153c8e5d1ef94963eb1f18454f7 /source/blender/bmesh | |
| parent | 4bdd4aa63371bdd73f3a9484f92348f1bf13b4e5 (diff) | |
cleanup: redundant casts & const cast correctness
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 10 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.h | 8 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 901b96c3ae0..308fa98843b 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -744,17 +744,17 @@ bool BM_vert_is_edge_pair(BMVert *v) /** * Returns the number of edges around this vertex. */ -int BM_vert_edge_count(BMVert *v) +int BM_vert_edge_count(const BMVert *v) { return bmesh_disk_count(v); } -int BM_vert_edge_count_nonwire(BMVert *v) +int BM_vert_edge_count_nonwire(const BMVert *v) { int count = 0; BMIter eiter; BMEdge *edge; - BM_ITER_ELEM (edge, &eiter, v, BM_EDGES_OF_VERT) { + BM_ITER_ELEM (edge, &eiter, (BMVert *)v, BM_EDGES_OF_VERT) { if (edge->l) { count++; } @@ -764,7 +764,7 @@ int BM_vert_edge_count_nonwire(BMVert *v) /** * Returns the number of faces around this edge */ -int BM_edge_face_count(BMEdge *e) +int BM_edge_face_count(const BMEdge *e) { int count = 0; @@ -786,7 +786,7 @@ int BM_edge_face_count(BMEdge *e) * Returns the number of faces around this vert * length matches #BM_LOOPS_OF_VERT iterator */ -int BM_vert_face_count(BMVert *v) +int BM_vert_face_count(const BMVert *v) { return bmesh_disk_facevert_count(v); } diff --git a/source/blender/bmesh/intern/bmesh_queries.h b/source/blender/bmesh/intern/bmesh_queries.h index 3dee4540c4c..9d598f865d0 100644 --- a/source/blender/bmesh/intern/bmesh_queries.h +++ b/source/blender/bmesh/intern/bmesh_queries.h @@ -64,10 +64,10 @@ BMFace *BM_vert_pair_share_face_by_angle( BMLoop **r_l_a, BMLoop **r_l_b, const bool allow_adjacent) ATTR_NONNULL(); -int BM_vert_edge_count_nonwire(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -int BM_vert_edge_count(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -int BM_edge_face_count(BMEdge *e) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -int BM_vert_face_count(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_vert_edge_count_nonwire(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_vert_edge_count(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_edge_face_count(const BMEdge *e) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +int BM_vert_face_count(const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMEdge *BM_vert_other_disk_edge(BMVert *v, BMEdge *e) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); bool BM_vert_is_edge_pair(BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 75f9feef413..9c8b9ca160d 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -238,7 +238,7 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op) static int vergaverco(const void *e1, const void *e2) { - const BMVert *v1 = *(void **)e1, *v2 = *(void **)e2; + const BMVert *v1 = *(const void **)e1, *v2 = *(const void **)e2; float x1 = v1->co[0] + v1->co[1] + v1->co[2]; float x2 = v2->co[0] + v2->co[1] + v2->co[2]; |