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

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.project

18
Doc/changelog.docu
View File

@@ -1,4 +1,4 @@
/** \page om_changelog Changelog /* \page om_changelog Changelog
\htmlonly \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> <b>General</b>
<ul> <ul>

2
README.md
View File

@@ -1,4 +1,4 @@
# OpenMesh, 5.0 # OpenMesh, 5.1
## Getting OpenMesh ## Getting OpenMesh

4
VERSION
View File

@@ -1,6 +1,6 @@
VERSION=5.0 VERSION=5.1
MAJOR=5 MAJOR=5
MINOR=0 MINOR=1
PATCH=0 PATCH=0
ID=OPENMESH ID=OPENMESH

2
cmake/FindOpenMesh.cmake
View File

@@ -63,6 +63,7 @@ IF (NOT OPENMESH_FOUND)
"${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh"
"${CMAKE_SOURCE_DIR}/../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 5.0"
"C:/Program Files/OpenMesh 4.2" "C:/Program Files/OpenMesh 4.2"
"C:/Program Files/OpenMesh 4.1" "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.1"
"C:/Program Files/OpenMesh 2.4" "C:/Program Files/OpenMesh 2.4"
"C:/Program Files/OpenMesh 2.0/include" "C:/Program Files/OpenMesh 2.0/include"
"C:/libs/OpenMesh 5.1"
"C:/libs/OpenMesh 5.0" "C:/libs/OpenMesh 5.0"
"C:/libs/OpenMesh 4.2" "C:/libs/OpenMesh 4.2"
"C:/libs/OpenMesh 4.1" "C:/libs/OpenMesh 4.1"

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

@@ -248,7 +248,7 @@ public:
/// Update normal for halfedge _heh /// Update normal for halfedge _heh
void update_normal(HalfedgeHandle _heh, const double _feature_angle = 0.8) 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. /** \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 //#define OM_VERSION 0x40200
// only defined, if it is a beta version // 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> 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> 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> )
{ {
} }