[Bf-blender-cvs] [ea07d93] master: Fix for fix (don't guess enum's sign)
Campbell Barton
noreply at git.blender.org
Mon Aug 18 23:09:06 CEST 2014
Commit: ea07d93f77d41017b9bfcb75359e8009de771866
Author: Campbell Barton
Date: Tue Aug 19 07:08:15 2014 +1000
Branches: master
https://developer.blender.org/rBea07d93f77d41017b9bfcb75359e8009de771866
Fix for fix (don't guess enum's sign)
===================================================================
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 252d5e4..8e80daa 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 + (int)i_t0);
+ return (IX_EDGE_TRI_EDGE0 + (enum ISectType)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 = (int)i;
+ *r_side = (enum ISectType)i;
return iv;
}
}
More information about the Bf-blender-cvs
mailing list