Revision: 48282
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48282
Author: jwilkins
Date: 2012-06-25 17:29:23 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
An ambiguous overloaded function resolution breaks the build of Eltopo.
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/extern/eltopo/eltopo3d/impactzonesolver.cpp
Modified:
branches/soc-2012-swiss_cheese/extern/eltopo/eltopo3d/impactzonesolver.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/extern/eltopo/eltopo3d/impactzonesolver.cpp
2012-06-25 17:27:54 UTC (rev 48281)
+++ branches/soc-2012-swiss_cheese/extern/eltopo/eltopo3d/impactzonesolver.cpp
2012-06-25 17:29:23 UTC (rev 48282)
@@ -304,7 +304,7 @@
assert( zone_vertex_iter != zone_vertices.end() );
- int mat_j = to_int( zone_vertex_iter - zone_vertices.begin() );
+ int mat_j = to_int((size_t)(zone_vertex_iter -
zone_vertices.begin()));
GCT(mat_j*3, i) = coll.m_alphas[v] * coll.m_normal[0];
GCT(mat_j*3+1, i) = coll.m_alphas[v] * coll.m_normal[1];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
