songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error of conflict resolution

This commit is contained in:
Maxime Gimeno 2016-05-12 17:21:21 +02:00
parent 6cae0df31c
commit b4a9deb8af
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
View File

@ -667,11 +667,7 @@ Scene_polygon_soup_item::draw(CGAL::Three::Viewer_interface* viewer) const {
initializeBuffers(viewer); initializeBuffers(viewer);
} }
if(soup == 0) return; if(soup == 0) return;
//Calls the buffer info again so that it's the right one used even if
//there are several objects drawn
vaos[Facets]->bind();
attribBuffers(viewer,PROGRAM_WITH_LIGHT); attribBuffers(viewer,PROGRAM_WITH_LIGHT);
QColor v_colors = this->color();
program = getShaderProgram(PROGRAM_WITH_LIGHT); program = getShaderProgram(PROGRAM_WITH_LIGHT);
program->bind(); program->bind();

2
Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
View File

@ -14,7 +14,7 @@
#include <CGAL/Triangulation_face_base_with_info_2.h> #include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h> #include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Constrained_triangulation_plus_2.h> #include <CGAL/Constrained_triangulation_plus_2.h>
#include <CGAL/Triangulation_2_filtered_projection_traits_3.h> #include <CGAL/Triangulation_2_projection_traits_3.h>
#include <CGAL/Polygon_mesh_processing/compute_normal.h> #include <CGAL/Polygon_mesh_processing/compute_normal.h>