diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 21:10:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 21:11:20 +0300 |
| commit | b09563ca8c42f46233bd104e30812e4fc7322ba3 (patch) | |
| tree | 49d304ba915aac88b69ab367f98eb71af36f2662 /source/blender/bmesh | |
| parent | ef80914c99fb94a4bc7e02a1f808eb0162577fec (diff) | |
Cleanup: fixes for building with recent clang
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_beautify.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c index e531db1d02d..990a2108bd7 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.c +++ b/source/blender/bmesh/tools/bmesh_beautify.c @@ -97,7 +97,7 @@ static GSet *erot_gset_new(void) static void erot_state_ex(const BMEdge *e, int v_index[2], int f_index[2]) { - BLI_assert(BM_edge_is_manifold((BMEdge *)e)); + BLI_assert(BM_edge_is_manifold(e)); BLI_assert(BM_vert_in_edge(e, e->l->prev->v) == false); BLI_assert(BM_vert_in_edge(e, e->l->radial_next->prev->v) == false); diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 4d87c3e3551..8a1569630fa 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -857,7 +857,7 @@ bool BM_mesh_intersect( {UNPACK3(looptris[i][2]->v->co)}, }; - BLI_bvhtree_insert(tree_a, i, (float *)t_cos, 3); + BLI_bvhtree_insert(tree_a, i, (const float *)t_cos, 3); } } BLI_bvhtree_balance(tree_a); @@ -874,7 +874,7 @@ bool BM_mesh_intersect( {UNPACK3(looptris[i][2]->v->co)}, }; - BLI_bvhtree_insert(tree_b, i, (float *)t_cos, 3); + BLI_bvhtree_insert(tree_b, i, (const float *)t_cos, 3); } } BLI_bvhtree_balance(tree_b); |