Permalink
Browse files

Merge branch 'master' of github.com:joesfer/RenderLib

Conflicts:
	source/geometry/tesellation/delaunay/delaunay2D.cpp
	source/geometry/tesellation/delaunay/delaunay3D.cpp
  • Loading branch information...
2 parents 121d0c3 + ffc3ba1 commit 925ddf3c2a3582d7855187abb2284d4f6ee00422 @joesfer committed Feb 15, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 source/geometry/tesellation/delaunay/delaunay2D.cpp
View
2 source/geometry/tesellation/delaunay/delaunay2D.cpp
@@ -743,7 +743,7 @@ namespace internal {
for( int t = 0; t < (int)triangles.size(); t++ ) {
Triangle_t& tri = triangles[ t ];
for( int v = 0; v < 3; v++ ) {
- vertexTriangleAdjacencyInfo[ tri.vertices[ v ] ].append( t );
+ vertexTriangleAdjacencyInfo[ tri.vertices[ v ] ].append( (int)t );
}
}

0 comments on commit 925ddf3

Please sign in to comment.