Merge branch 'master-upstream' into python_bindings

Former-commit-id: 1bfdf9b30e
2016-09-14 19:13:03 +02:00
parent ba5cfc10ba 14098dfb10
commit 19f547093e
115 changed files with 3577 additions and 1071 deletions
@@ -88,6 +88,7 @@ PYBIND11_PLUGIN(pyigl) {
           doublearea
           dqs
           edge_lengths
+           edge_topology
           eigs
           embree_ambient_occlusion
           embree_reorient_facets_raycast
@@ -140,6 +141,9 @@ PYBIND11_PLUGIN(pyigl) {
           slice_mask
           slice_tets
           sortrows
+           streamlines_init
+           streamlines_next
+           triangle_triangle_adjacency
           triangle_triangulate
           unique
           unproject_onto_mesh