Commit fc5c715d authored by Hans-Christian Ebke's avatar Hans-Christian Ebke
Browse files

Merge remote-tracking branch 'remotes/origin/master'

parents 287da209 59c6c56c
.project
/** \page om_changelog Changelog
/* \page om_changelog Changelog
\htmlonly
......@@ -7,7 +7,21 @@
<!-- --------------------------------------------------------------------- -->
<tr valign=top><td><b>5.0</b> (?/?/?)</td><td>
<tr valign=top><td><b>6.0</b> (?/?/?)</td><td>
</tr>
<tr valign=top><td><b>5.1</b> (?/?/?)</td><td>
</tr>
<tr valign=top><td><b>5.0</b> (2015/11/18)</td><td>
<b>General</b>
<ul>
......
# OpenMesh, 5.0
# OpenMesh, 5.1
## Getting OpenMesh
......
VERSION=5.0
VERSION=5.1
MAJOR=5
MINOR=0
MINOR=1
PATCH=0
ID=OPENMESH
......@@ -63,6 +63,7 @@ IF (NOT OPENMESH_FOUND)
"${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh"
"C:/Program Files/OpenMesh 5.1"
"C:/Program Files/OpenMesh 5.0"
"C:/Program Files/OpenMesh 4.2"
"C:/Program Files/OpenMesh 4.1"
......@@ -75,6 +76,7 @@ IF (NOT OPENMESH_FOUND)
"C:/Program Files/OpenMesh 2.4.1"
"C:/Program Files/OpenMesh 2.4"
"C:/Program Files/OpenMesh 2.0/include"
"C:/libs/OpenMesh 5.1"
"C:/libs/OpenMesh 5.0"
"C:/libs/OpenMesh 4.2"
"C:/libs/OpenMesh 4.1"
......
......@@ -248,7 +248,7 @@ public:
/// Update normal for halfedge _heh
void update_normal(HalfedgeHandle _heh, const double _feature_angle = 0.8)
{ this->set_normal(_heh, calc_halfedge_normal(_heh)); }
{ this->set_normal(_heh, calc_halfedge_normal(_heh,_feature_angle)); }
/** \brief Update normal vectors for all halfedges.
*
......
......@@ -64,7 +64,7 @@
// ----------------------------------------------------------------------------
#define OM_VERSION 0x50000
#define OM_VERSION 0x50100
//#define OM_VERSION 0x40200
// only defined, if it is a beta version
......
......@@ -91,7 +91,7 @@ inline void vector_cast( const src_t &_src, dst_t &_dst, GenProg::Int2Type<n> )
}
template <typename src_t, typename dst_t>
inline void vector_cast( const src_t &_src, dst_t &_dst, GenProg::Int2Type<0> )
inline void vector_cast( const src_t & /*_src*/, dst_t & /*_dst*/, GenProg::Int2Type<0> )
{
}
......@@ -105,7 +105,7 @@ inline void vector_copy( const src_t &_src, dst_t &_dst, GenProg::Int2Type<n> )
}
template <typename src_t, typename dst_t>
inline void vector_copy( const src_t &_src, dst_t &_dst, GenProg::Int2Type<0> )
inline void vector_copy( const src_t & /*_src*/, dst_t & /*_dst*/ , GenProg::Int2Type<0> )
{
}
......
Supports Markdown
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