diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-18 17:26:57 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-18 17:39:40 +0400 |
| commit | 2a514f8e29887c8a3422984d6df370f49bd91116 (patch) | |
| tree | 4291acd87ad72a8ccc0c2f24f9d2034c9d915265 /source/blender/bmesh | |
| parent | afa3469288337079cbff2bcecb7142448e961393 (diff) | |
Fix building on some compilers (clang on OSX).
Reported and patch by jensverwiebe (jens verwiebe).
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 173ae955b5e..252d5e4f8dc 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -307,7 +307,7 @@ static enum ISectType intersect_line_tri( fac = line_point_factor_v3(ix_pair[0], p0, p1); if ((fac >= e->eps_margin) && (fac <= 1.0f - e->eps_margin)) { copy_v3_v3(r_ix, ix_pair[0]); - return (IX_EDGE_TRI_EDGE0 + i_t0); + return (IX_EDGE_TRI_EDGE0 + (int)i_t0); } } } @@ -402,7 +402,7 @@ static BMVert *bm_isect_edge_tri( #ifdef USE_DUMP printf("# cache hit (%d, %d, %d, %d)\n", UNPACK4(k_arr[i])); #endif - *r_side = i; + *r_side = (int)i; return iv; } } |