phynexis-deps/igl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'af6f17aa78d022b7c3ecd12e6dd30da3ba03bf1b [formerly 26bfb6db5b]'

Browse Source 
# Conflicts:
#	README.md
#	include/igl/adjacency_matrix.cpp
#	include/igl/ambient_occlusion.cpp
#	include/igl/angle_bound_frame_fields.cpp
#	include/igl/colon.cpp
#	include/igl/comb_cross_field.cpp
#	include/igl/comb_line_field.cpp
#	include/igl/copyleft/boolean/mesh_boolean.cpp
#	include/igl/copyleft/boolean/mesh_boolean.h
#	include/igl/copyleft/cgal/RemeshSelfIntersectionsParam.h
#	include/igl/copyleft/cgal/SelfIntersectMesh.h
#	include/igl/copyleft/cgal/closest_facet.cpp
#	include/igl/copyleft/cgal/closest_facet.h
#	include/igl/copyleft/cgal/extract_cells.cpp
#	include/igl/copyleft/cgal/order_facets_around_edge.cpp
#	include/igl/copyleft/cgal/order_facets_around_edge.h
#	include/igl/copyleft/cgal/outer_hull.cpp
#	include/igl/copyleft/cgal/outer_hull.h
#	include/igl/copyleft/cgal/piecewise_constant_winding_number.cpp
#	include/igl/copyleft/cgal/propagate_winding_numbers.cpp
#	include/igl/copyleft/cgal/propagate_winding_numbers.h
#	include/igl/copyleft/cgal/remesh_intersections.cpp
#	include/igl/copyleft/cgal/remesh_intersections.h
#	include/igl/copyleft/marching_cubes.cpp
#	include/igl/copyleft/marching_cubes.h
#	include/igl/copyleft/quadprog.cpp
#	include/igl/copyleft/tetgen/cdt.cpp
#	include/igl/cross_field_missmatch.cpp
#	include/igl/cut_mesh.cpp
#	include/igl/cut_mesh_from_singularities.cpp
#	include/igl/embree/unproject_onto_mesh.cpp
#	include/igl/extract_manifold_patches.h
#	include/igl/find_cross_field_singularities.cpp
#	include/igl/line_field_missmatch.cpp
#	include/igl/list_to_matrix.cpp
#	include/igl/n_polyvector.cpp
#	include/igl/n_polyvector_general.cpp
#	include/igl/piecewise_constant_winding_number.cpp
#	include/igl/polyvector_field_matchings.cpp
#	include/igl/project_to_line.cpp
#	include/igl/ray_mesh_intersect.cpp
#	include/igl/ray_mesh_intersect.h
#	include/igl/sort.cpp
#	include/igl/unproject_in_mesh.cpp
#	include/igl/unproject_in_mesh.h
#	tutorial/609_Boolean/CMakeLists.txt
#	tutorial/610_CSGTree/CMakeLists.txt
#	tutorial/CMakeLists.shared
#	tutorial/CMakeLists.txt


Former-commit-id: 7fbfe317f9
This commit is contained in:
Daniele Panozzo
2016-03-02 17:46:15 -05:00
parent bd3c154117 af6f17aa78
commit c04e0ef1c3
62 changed files with 1223 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tutorial/601_Serialization/main.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ struct State : public igl::Serializable
// You have to define this function to
// register the fields you want to serialize
void InitSerialization()
virtual void InitSerialization()
{
this->Add(V , "V");
this->Add(F , "F");