diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 5feaf07f..88dc44a5 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -6,6 +6,19 @@ + +7.1 (?/?/?) + + +General + + + + + + 7.0 (2018/04/19) Breaking changes @@ -62,7 +75,7 @@
  • BaseExporter: Added accessor functions for HalfEdgeHandles and faceTexCoords to base exporter and exporter template.
  • OBJ Writer: Fail if vertex color export was requested (Thanks to Manuel Massing)
  • OBJ Writer: Added functionality to store FaceTexCoords to objwriter
  • -
  • OBJ Writer: Applied fix for bad or missing vertex tex coords (Thanks to Gero Müller for the patch)
  • > +
  • OBJ Writer: Applied fix for bad or missing vertex tex coords (Thanks to Gero Müller for the patch)
  • OBJ Writer: Fix vertex texture coordinates export in OBJ writer
  • OBJ Loader: range check for vertex colors and normals in OBJ loader
  • OBJ Loader: fixed handling of negative indices in OBJ loader
  • diff --git a/VERSION b/VERSION index 7028d24e..965f7b0e 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=7.0 +VERSION=7.1 MAJOR=7 -MINOR=0 +MINOR=1 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 693b1517..5893b084 100644 --- a/cmake/FindOpenMesh.cmake +++ b/cmake/FindOpenMesh.cmake @@ -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 7.1" "C:/Program Files/OpenMesh 7.0" "C:/Program Files/OpenMesh 6.3" "C:/Program Files/OpenMesh 6.2" @@ -82,6 +83,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 7.1" "C:/libs/OpenMesh 7.0" "C:/libs/OpenMesh 6.3" "C:/libs/OpenMesh 6.2" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index e0d436e3..65c0b3e2 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -65,11 +65,7 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x70000 -//#define OM_VERSION 0x60300 - -// only defined, if it is a beta version -//#define OM_VERSION_BETA 4 +#define OM_VERSION 0x70100 #define OM_GET_VER ((OM_VERSION & 0xf0000) >> 16) #define OM_GET_MAJ ((OM_VERSION & 0x0ff00) >> 8)