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

Fixes 

Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
This commit is contained in:
Maxime Gimeno 2017-06-29 10:46:08 +02:00
parent 19eda69f8c
commit 8104d153af
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AABB_tree/demo/AABB_tree/Scene.h
View File

@ -16,6 +16,7 @@
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <QtCore/qglobal.h>
#include <QMap>
#include <QGLViewer/manipulatedFrame.h>
#include <QGLViewer/qglviewer.h>
#include <QOpenGLFunctions_2_1>

2
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
View File

@ -22,7 +22,7 @@
#include <QApplication>
#include <QKeyEvent>
#include <QMap>
#include <QGLViewer/qglviewer.h>
#include <QKeyEvent>
#include <QOpenGLFunctions_2_1>

5
Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
View File

@ -194,7 +194,7 @@ public Q_SLOTS:
plane->plane(),
ui_widget.close_checkBox->isChecked());
poly->invalidateOpenGLBuffers();
viewer->updateGL();
}
else
{
@ -223,10 +223,9 @@ public Q_SLOTS:
new_item->setVisible(poly->visible());
scene->addItem(new_item);
new_item->invalidateOpenGLBuffers();
viewer->updateGL();
}
}
viewer->update();
}
QApplication::restoreOverrideCursor();
}

1
Triangulation_3/demo/Triangulation_3/Scene.h
View File

@ -2,6 +2,7 @@
#define SCENE_H
#include "typedefs.h"
#include <QMap>
#include <QGLViewer/qglviewer.h>
class Scene {