griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix building on some compilers (clang on OSX).

Browse Source 
Reported and patch by jensverwiebe (jens verwiebe).
This commit is contained in:
Bastien Montagne
2014-08-18 15:26:57 +02:00
parent afa3469288
commit 2a514f8e29
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/bmesh/tools/bmesh_intersect.c
View File

@@ -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;
}
}