Commit c85a9212 authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'master' into TetrahedralMeshSupport

Conflicts:
	Plugin-PropertyVis/PropertyVisPlugin.cc
	libs_required/OpenVolumeMesh
parents 2fd31e36 2d95247c
......@@ -50,8 +50,6 @@
#include "VolumeMeshSelectionPlugin.hh"
#include <OpenVolumeMesh/Attribs/StatusAttrib.hh>
/*
* Vertices
*/
......
......@@ -49,8 +49,6 @@
#include "VolumeMeshSelectionPlugin.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
// Primitive type icons
#define VERTEX_TYPE "selection_vertex.png"
#define EDGE_TYPE "selection_edge.png"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment