From eeffcc82eec7ff6c55b53930d8ce603c75fb6f03 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Fri, 5 May 2017 11:22:53 +0200 Subject: [PATCH] Merge V8_3_BR branch. --- CMakeLists.txt | 2 +- doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65b5c7e..4e21fc0 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 0) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) # Common CMake macros # =================== diff --git a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc index 8199547..ec7d33c 100644 --- a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc +++ b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc @@ -123,7 +123,7 @@ deactivated by setting this parameter to 0, giving priority to the tiny edge or removal. - use deprecated patch mesher - This option reproduces the mesher behaviour of previous MG-CADSurf versions -(MeshGems 2.1-11 and older, before SALOME 8.2). This has proved useful on some particular cases such as very small +(MeshGems before 2.3, i.e. before SALOME 8.2). This has proved useful on some particular cases such as very small local size on a vertex situated on a border curve. - CAD preprocessor options. The CAD preprocessor (formerly known as PreCAD) has two main goals: @@ -264,7 +264,10 @@ interpolate two values, a linear interpolation is used by default, but this can be modified by \ref blsurf_hinterpol_flag "hinterpol flag". Note: on some particular configurations, the mesher behaviour is -not the same as before (SALOME versions before 8.2). See "use deprecated patch mesher" +not the same as before (SALOME versions before 8.2 i.e. MeshGems before 2.3). +For a small local size defined on a point situated on a border curve, +the previous mesher behaviour may be prefered: +see "use deprecated patch mesher" on advanced tag. -- 2.39.2