Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hans-Christian Ebke
2015-11-18 15:12:38 +01:00
parent 287da20912 59c6c56c45
commit fc5c715dd3
8 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Core/Mesh/PolyMeshT.hh
View File

@@ -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.
*

2
src/OpenMesh/Core/System/config.h
View File

@@ -64,7 +64,7 @@
// ----------------------------------------------------------------------------
#define OM_VERSION 0x50000
#define OM_VERSION 0x50100
//#define OM_VERSION 0x40200
// only defined, if it is a beta version

4
src/OpenMesh/Core/Utils/vector_cast.hh
View File

@@ -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> )
{
}