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

Fix segfault in selection

This commit is contained in:
Maxime Gimeno 2017-11-15 16:55:32 +01:00
parent 6389050f9b
commit 6fd37cbfab
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection.h
View File

@ -204,7 +204,7 @@ public Q_SLOTS:
// paint with mouse move event // paint with mouse move event
QGLViewer* viewer = *QGLViewer::QGLViewerPool().begin(); QGLViewer* viewer = *QGLViewer::QGLViewerPool().begin();
qglviewer::Camera* camera = viewer->camera(); qglviewer::Camera* camera = viewer->camera();
viewer->makeCurrent();
bool found = false; bool found = false;
const qglviewer::Vec& point = camera->pointUnderPixel(paint_pos, found) - offset; const qglviewer::Vec& point = camera->pointUnderPixel(paint_pos, found) - offset;
if(found) if(found)

18
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
View File

@ -190,7 +190,7 @@ void Scene_polyhedron_selection_item_priv::initializeBuffers(CGAL::Three::Viewer
program->enableAttributeArray("normals"); program->enableAttributeArray("normals");
program->setAttributeBuffer("normals",GL_FLOAT,0,3); program->setAttributeBuffer("normals",GL_FLOAT,0,3);
item->buffers[NormalFacets].release(); item->buffers[NormalFacets].release();
program->disableAttributeArray("colors");
item->vaos[Facets]->release(); item->vaos[Facets]->release();
program->release(); program->release();
@ -207,7 +207,7 @@ void Scene_polyhedron_selection_item_priv::initializeBuffers(CGAL::Three::Viewer
program->enableAttributeArray("vertex"); program->enableAttributeArray("vertex");
program->setAttributeBuffer("vertex",GL_FLOAT,0,3); program->setAttributeBuffer("vertex",GL_FLOAT,0,3);
item->buffers[VertexEdges].release(); item->buffers[VertexEdges].release();
program->disableAttributeArray("colors");
program->release(); program->release();
item->vaos[Edges]->release(); item->vaos[Edges]->release();
@ -225,9 +225,10 @@ void Scene_polyhedron_selection_item_priv::initializeBuffers(CGAL::Three::Viewer
program->enableAttributeArray("vertex"); program->enableAttributeArray("vertex");
program->setAttributeBuffer("vertex",GL_FLOAT,0,3); program->setAttributeBuffer("vertex",GL_FLOAT,0,3);
item->buffers[VertexPoints].release(); item->buffers[VertexPoints].release();
program->disableAttributeArray("colors");
item->vaos[Points]->release();
program->release(); program->release();
item->vaos[Points]->release();
} }
nb_facets = positions_facets.size(); nb_facets = positions_facets.size();
@ -270,7 +271,7 @@ void Scene_polyhedron_selection_item_priv::initialize_temp_buffers(CGAL::Three::
program->enableAttributeArray("normals"); program->enableAttributeArray("normals");
program->setAttributeBuffer("normals",GL_FLOAT,0,3); program->setAttributeBuffer("normals",GL_FLOAT,0,3);
item->buffers[NormalTempFacets].release(); item->buffers[NormalTempFacets].release();
program->disableAttributeArray("colors");
item->vaos[TempFacets]->release(); item->vaos[TempFacets]->release();
program->release(); program->release();
} }
@ -286,7 +287,7 @@ void Scene_polyhedron_selection_item_priv::initialize_temp_buffers(CGAL::Three::
program->enableAttributeArray("vertex"); program->enableAttributeArray("vertex");
program->setAttributeBuffer("vertex",GL_FLOAT,0,3); program->setAttributeBuffer("vertex",GL_FLOAT,0,3);
item->buffers[VertexTempEdges].release(); item->buffers[VertexTempEdges].release();
program->disableAttributeArray("colors");
program->release(); program->release();
item->vaos[TempEdges]->release(); item->vaos[TempEdges]->release();
@ -320,6 +321,7 @@ void Scene_polyhedron_selection_item_priv::initialize_temp_buffers(CGAL::Three::
program->enableAttributeArray("colors"); program->enableAttributeArray("colors");
program->setAttributeBuffer("colors",GL_FLOAT,0,3); program->setAttributeBuffer("colors",GL_FLOAT,0,3);
item->buffers[ColorFixedPoints].release(); item->buffers[ColorFixedPoints].release();
program->disableAttributeArray("colors");
item->vaos[FixedPoints]->release(); item->vaos[FixedPoints]->release();
program->release(); program->release();
@ -366,7 +368,7 @@ void Scene_polyhedron_selection_item_priv::initialize_HL_buffers(CGAL::Three::Vi
program->enableAttributeArray("normals"); program->enableAttributeArray("normals");
program->setAttributeBuffer("normals",GL_FLOAT,0,3); program->setAttributeBuffer("normals",GL_FLOAT,0,3);
item->buffers[NormalHLFacets].release(); item->buffers[NormalHLFacets].release();
program->disableAttributeArray("colors");
item->vaos[HLFacets]->release(); item->vaos[HLFacets]->release();
program->release(); program->release();
@ -383,7 +385,7 @@ void Scene_polyhedron_selection_item_priv::initialize_HL_buffers(CGAL::Three::Vi
program->enableAttributeArray("vertex"); program->enableAttributeArray("vertex");
program->setAttributeBuffer("vertex",GL_FLOAT,0,3); program->setAttributeBuffer("vertex",GL_FLOAT,0,3);
item->buffers[VertexHLEdges].release(); item->buffers[VertexHLEdges].release();
program->disableAttributeArray("colors");
program->release(); program->release();
item->vaos[HLEdges]->release(); item->vaos[HLEdges]->release();
@ -401,7 +403,7 @@ void Scene_polyhedron_selection_item_priv::initialize_HL_buffers(CGAL::Three::Vi
program->enableAttributeArray("vertex"); program->enableAttributeArray("vertex");
program->setAttributeBuffer("vertex",GL_FLOAT,0,3); program->setAttributeBuffer("vertex",GL_FLOAT,0,3);
item->buffers[VertexHLPoints].release(); item->buffers[VertexHLPoints].release();
program->disableAttributeArray("colors");
program->release(); program->release();
item->vaos[HLPoints]->release(); item->vaos[HLPoints]->release();