From b4a9deb8af10bca2aaa6b9a79c07b21141d0f55a Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Thu, 12 May 2016 17:21:21 +0200
Subject: [PATCH] Fix error of conflict resolution

---
 Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp | 4 ----
 Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
index fae8edf2608..42f47da1925 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
@@ -667,11 +667,7 @@ Scene_polygon_soup_item::draw(CGAL::Three::Viewer_interface* viewer) const {
      initializeBuffers(viewer);
     }
     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);
-    QColor v_colors = this->color();
     program = getShaderProgram(PROGRAM_WITH_LIGHT);
     program->bind();
 
diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
index 716e0c09e23..2ffcce8eed0 100644
--- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
@@ -14,7 +14,7 @@
 #include <CGAL/Triangulation_face_base_with_info_2.h>
 #include <CGAL/Constrained_Delaunay_triangulation_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>