[Bf-blender-cvs] [2a514f8] master: Fix building on some compilers (clang on OSX).
Bastien Montagne
noreply at git.blender.org
Mon Aug 18 15:39:55 CEST 2014
Commit: 2a514f8e29887c8a3422984d6df370f49bd91116
Author: Bastien Montagne
Date: Mon Aug 18 15:26:57 2014 +0200
Branches: master
https://developer.blender.org/rB2a514f8e29887c8a3422984d6df370f49bd91116
Fix building on some compilers (clang on OSX).
Reported and patch by jensverwiebe (jens verwiebe).
===================================================================
M source/blender/bmesh/tools/bmesh_intersect.c
===================================================================
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index 173ae95..252d5e4 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;
}
}
More information about the Bf-blender-cvs
mailing list